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

Change in osmo-bts[master]: osmo-bts-trx: use '#pragma once' in amr_loop.h

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/27751 ) Change subject: osmo-bts-trx: use '#pragma once' in amr_loop.h ...................................................................... osmo-bts-trx: use '#pragma once' in amr_loop.h Change-Id: I98e42485955de4a261b6c8d865e84c313c1145d5 Related: SYS#5917, OS#4984 --- M src/osmo-bts-trx/amr_loop.h 1 file changed, 1 insertion(+), 4 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved laforge: Looks good to me, approved diff --git a/src/osmo-bts-trx/amr_loop.h b/src/osmo-bts-trx/amr_loop.h index 4aa05c4..85f73fd 100644 --- a/src/osmo-bts-trx/amr_loop.h +++ b/src/osmo-bts-trx/amr_loop.h @@ -1,5 +1,4 @@ -#ifndef _TRX_LOOPS_H -#define _TRX_LOOPS_H +#pragma once #include <osmo-bts/scheduler.h> @@ -15,5 +14,3 @@ int n_errors, int n_bits_total); void trx_loop_amr_set(struct l1sched_chan_state *chan_state, int loop); - -#endif /* _TRX_LOOPS_H */ -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/27751 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I98e42485955de4a261b6c8d865e84c313c1145d5 Gerrit-Change-Number: 27751 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(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, 2 months

1
0
0 0

Change in osmo-bsc[master]: VTY: clarify help for the Adaptive Multi Rate settings

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27743 ) Change subject: VTY: clarify help for the Adaptive Multi Rate settings ...................................................................... VTY: clarify help for the Adaptive Multi Rate settings * Always say 'codec mode', not just 'codec'. * Suggest proper modes in AMR_{TH,HY}_HELP_STR. * Use 3GPP's definition of threshold and hysteresis. * Clarify that threshold and hysteresis values are in 0.5 dB steps. Change-Id: I996eae8aafeb2850e5e1a6f5a7764d745e1289b5 Related: SYS#5917, OS#4984 --- M src/osmo-bsc/bts_vty.c 1 file changed, 34 insertions(+), 18 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/osmo-bsc/bts_vty.c b/src/osmo-bsc/bts_vty.c index d675922..1411cd3 100644 --- a/src/osmo-bsc/bts_vty.c +++ b/src/osmo-bsc/bts_vty.c @@ -2386,10 +2386,12 @@ #define AMR_TEXT "Adaptive Multi Rate settings\n" #define AMR_MODE_TEXT "Codec modes to use with AMR codec\n" -#define AMR_START_TEXT "Initial codec to use with AMR\n" \ - "Automatically\nFirst codec\nSecond codec\nThird codec\nFourth codec\n" -#define AMR_TH_TEXT "AMR threshold between codecs\nMS side\nBTS side\n" -#define AMR_HY_TEXT "AMR hysteresis between codecs\nMS side\nBTS side\n" +#define AMR_START_TEXT "Initial codec mode to use with AMR\n" \ + "Automatically\nFirst mode\nSecond mode\nThird mode\nFourth mode\n" +#define AMR_MS_BTS_TEXT "MS side\nBTS side\n" +#define AMR_TH_TEXT "Lower threshold(s) for switching between codec modes\n" AMR_MS_BTS_TEXT +#define AMR_HY_TEXT "Hysteresis value(s) to obtain the higher threshold(s) " \ + "for switching between codec modes\n" AMR_MS_BTS_TEXT static int get_amr_from_arg(struct vty *vty, int argc, const char *argv[], int full) { @@ -2546,8 +2548,10 @@ #define AMR_TCHH_PAR_STR " (0|1|2|3|4|5)" #define AMR_TCHH_HELP_STR "4,75k\n5,15k\n5,90k\n6,70k\n7,40k\n7,95k\n" -#define AMR_TH_HELP_STR "Threshold between codec 1 and 2\n" -#define AMR_HY_HELP_STR "Hysteresis between codec 1 and 2\n" +#define AMR_TH_HELP_STR(a, b) \ + "Threshold between codec mode " a " and " b " (in 0.5 dB steps)\n" +#define AMR_HY_HELP_STR(a, b) \ + "Hysteresis between codec mode " a " and " b " (in 0.5 dB steps)\n" DEFUN_USRATTR(cfg_bts_amr_fr_modes1, cfg_bts_amr_fr_modes1_cmd, @@ -2612,7 +2616,7 @@ X(BSC_VTY_ATTR_NEW_LCHAN), "amr tch-f threshold (ms|bts) <0-63>", AMR_TEXT "Full Rate\n" AMR_TH_TEXT - AMR_TH_HELP_STR) + AMR_TH_HELP_STR("1", "2")) { get_amr_th_from_arg(vty, 2, argv, 1); return check_amr_config(vty); @@ -2623,7 +2627,8 @@ X(BSC_VTY_ATTR_NEW_LCHAN), "amr tch-f threshold (ms|bts) <0-63> <0-63>", AMR_TEXT "Full Rate\n" AMR_TH_TEXT - AMR_TH_HELP_STR AMR_TH_HELP_STR) + AMR_TH_HELP_STR("1", "2") + AMR_TH_HELP_STR("2", "3")) { get_amr_th_from_arg(vty, 3, argv, 1); return check_amr_config(vty); @@ -2634,7 +2639,9 @@ X(BSC_VTY_ATTR_NEW_LCHAN), "amr tch-f threshold (ms|bts) <0-63> <0-63> <0-63>", AMR_TEXT "Full Rate\n" AMR_TH_TEXT - AMR_TH_HELP_STR AMR_TH_HELP_STR AMR_TH_HELP_STR) + AMR_TH_HELP_STR("1", "2") + AMR_TH_HELP_STR("2", "3") + AMR_TH_HELP_STR("3", "4")) { get_amr_th_from_arg(vty, 4, argv, 1); return check_amr_config(vty); @@ -2645,7 +2652,7 @@ X(BSC_VTY_ATTR_NEW_LCHAN), "amr tch-f hysteresis (ms|bts) <0-15>", AMR_TEXT "Full Rate\n" AMR_HY_TEXT - AMR_HY_HELP_STR) + AMR_HY_HELP_STR("1", "2")) { get_amr_hy_from_arg(vty, 2, argv, 1); return check_amr_config(vty); @@ -2656,7 +2663,8 @@ X(BSC_VTY_ATTR_NEW_LCHAN), "amr tch-f hysteresis (ms|bts) <0-15> <0-15>", AMR_TEXT "Full Rate\n" AMR_HY_TEXT - AMR_HY_HELP_STR AMR_HY_HELP_STR) + AMR_HY_HELP_STR("1", "2") + AMR_HY_HELP_STR("2", "3")) { get_amr_hy_from_arg(vty, 3, argv, 1); return CMD_SUCCESS; @@ -2667,7 +2675,9 @@ X(BSC_VTY_ATTR_NEW_LCHAN), "amr tch-f hysteresis (ms|bts) <0-15> <0-15> <0-15>", AMR_TEXT "Full Rate\n" AMR_HY_TEXT - AMR_HY_HELP_STR AMR_HY_HELP_STR AMR_HY_HELP_STR) + AMR_HY_HELP_STR("1", "2") + AMR_HY_HELP_STR("2", "3") + AMR_HY_HELP_STR("3", "4")) { get_amr_hy_from_arg(vty, 4, argv, 1); return check_amr_config(vty); @@ -2736,7 +2746,7 @@ X(BSC_VTY_ATTR_NEW_LCHAN), "amr tch-h threshold (ms|bts) <0-63>", AMR_TEXT "Half Rate\n" AMR_TH_TEXT - AMR_TH_HELP_STR) + AMR_TH_HELP_STR("1", "2")) { get_amr_th_from_arg(vty, 2, argv, 0); return check_amr_config(vty); @@ -2747,7 +2757,8 @@ X(BSC_VTY_ATTR_NEW_LCHAN), "amr tch-h threshold (ms|bts) <0-63> <0-63>", AMR_TEXT "Half Rate\n" AMR_TH_TEXT - AMR_TH_HELP_STR AMR_TH_HELP_STR) + AMR_TH_HELP_STR("1", "2") + AMR_TH_HELP_STR("2", "3")) { get_amr_th_from_arg(vty, 3, argv, 0); return check_amr_config(vty); @@ -2758,7 +2769,9 @@ X(BSC_VTY_ATTR_NEW_LCHAN), "amr tch-h threshold (ms|bts) <0-63> <0-63> <0-63>", AMR_TEXT "Half Rate\n" AMR_TH_TEXT - AMR_TH_HELP_STR AMR_TH_HELP_STR AMR_TH_HELP_STR) + AMR_TH_HELP_STR("1", "2") + AMR_TH_HELP_STR("2", "3") + AMR_TH_HELP_STR("3", "4")) { get_amr_th_from_arg(vty, 4, argv, 0); return check_amr_config(vty); @@ -2769,7 +2782,7 @@ X(BSC_VTY_ATTR_NEW_LCHAN), "amr tch-h hysteresis (ms|bts) <0-15>", AMR_TEXT "Half Rate\n" AMR_HY_TEXT - AMR_HY_HELP_STR) + AMR_HY_HELP_STR("1", "2")) { get_amr_hy_from_arg(vty, 2, argv, 0); return check_amr_config(vty); @@ -2780,7 +2793,8 @@ X(BSC_VTY_ATTR_NEW_LCHAN), "amr tch-h hysteresis (ms|bts) <0-15> <0-15>", AMR_TEXT "Half Rate\n" AMR_HY_TEXT - AMR_HY_HELP_STR AMR_HY_HELP_STR) + AMR_HY_HELP_STR("1", "2") + AMR_HY_HELP_STR("2", "3")) { get_amr_hy_from_arg(vty, 3, argv, 0); return check_amr_config(vty); @@ -2791,7 +2805,9 @@ X(BSC_VTY_ATTR_NEW_LCHAN), "amr tch-h hysteresis (ms|bts) <0-15> <0-15> <0-15>", AMR_TEXT "Half Rate\n" AMR_HY_TEXT - AMR_HY_HELP_STR AMR_HY_HELP_STR AMR_HY_HELP_STR) + AMR_HY_HELP_STR("1", "2") + AMR_HY_HELP_STR("2", "3") + AMR_HY_HELP_STR("3", "4")) { get_amr_hy_from_arg(vty, 4, argv, 0); return check_amr_config(vty); -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27743 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I996eae8aafeb2850e5e1a6f5a7764d745e1289b5 Gerrit-Change-Number: 27743 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(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, 2 months

1
0
0 0

Change in osmo-bsc[master]: bts: gsm_bts_alloc(): rework default multi-rate configuration

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27744 ) Change subject: bts: gsm_bts_alloc(): rework default multi-rate configuration ...................................................................... bts: gsm_bts_alloc(): rework default multi-rate configuration This is cosmetic change making the default multi-rate configuration easier to read/understand and modify. Change-Id: I3d03c2188d007a60a86961a346744400bc81d4e6 Related: SYS#5917, OS#4984 --- M src/osmo-bsc/bts.c 1 file changed, 36 insertions(+), 47 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/osmo-bsc/bts.c b/src/osmo-bsc/bts.c index 843d711..c335963 100644 --- a/src/osmo-bsc/bts.c +++ b/src/osmo-bsc/bts.c @@ -169,8 +169,6 @@ struct gsm_bts *gsm_bts_alloc(struct gsm_network *net, struct gsm_bts_sm *bts_sm, uint8_t bts_num) { struct gsm_bts *bts = talloc_zero(bts_sm, struct gsm_bts); - struct gsm48_multi_rate_conf mr_cfg; - int i; if (!bts) return NULL; @@ -337,58 +335,49 @@ /* Set reasonable defaults for AMR-FR and AMR-HR rate configuration. * (see also 3GPP TS 28.062, Table 7.11.3.1.3-2) */ - mr_cfg = (struct gsm48_multi_rate_conf) { + static const struct gsm48_multi_rate_conf amr_fr_mr_cfg = { .m4_75 = 1, - .m5_15 = 0, .m5_90 = 1, - .m6_70 = 0, .m7_40 = 1, - .m7_95 = 0, - .m10_2 = 0, .m12_2 = 1 }; - memcpy(bts->mr_full.gsm48_ie, &mr_cfg, sizeof(bts->mr_full.gsm48_ie)); - bts->mr_full.ms_mode[0].mode = 0; - bts->mr_full.ms_mode[1].mode = 2; - bts->mr_full.ms_mode[2].mode = 4; - bts->mr_full.ms_mode[3].mode = 7; - bts->mr_full.bts_mode[0].mode = 0; - bts->mr_full.bts_mode[1].mode = 2; - bts->mr_full.bts_mode[2].mode = 4; - bts->mr_full.bts_mode[3].mode = 7; - for (i = 0; i < 3; i++) { - bts->mr_full.ms_mode[i].hysteresis = 8; - bts->mr_full.ms_mode[i].threshold = 32; - bts->mr_full.bts_mode[i].hysteresis = 8; - bts->mr_full.bts_mode[i].threshold = 32; - } + static const struct gsm48_multi_rate_conf amr_hr_mr_cfg = { + .m4_75 = 1, + .m5_90 = 1, + .m7_40 = 1, + }; + + memcpy(bts->mr_full.gsm48_ie, &amr_fr_mr_cfg, sizeof(bts->mr_full.gsm48_ie)); + memcpy(bts->mr_half.gsm48_ie, &amr_hr_mr_cfg, sizeof(bts->mr_half.gsm48_ie)); + + static const struct amr_mode amr_ms_bts_mode[] = { + { + .mode = 0, /* 4.75k */ + .threshold = 32, + .hysteresis = 8, + }, + { + .mode = 2, /* 5.90k */ + .threshold = 32, + .hysteresis = 8, + }, + { + .mode = 4, /* 7.40k */ + .threshold = 32, + .hysteresis = 8, + }, + { + .mode = 7, /* 12.2k */ + /* this is the last mode, so no threshold */ + }, + }; + + memcpy(&bts->mr_full.ms_mode[0], &amr_ms_bts_mode[0], sizeof(amr_ms_bts_mode)); + memcpy(&bts->mr_full.bts_mode[0], &amr_ms_bts_mode[0], sizeof(amr_ms_bts_mode)); bts->mr_full.num_modes = 4; - mr_cfg = (struct gsm48_multi_rate_conf) { - .m4_75 = 1, - .m5_15 = 0, - .m5_90 = 1, - .m6_70 = 0, - .m7_40 = 1, - .m7_95 = 0, - .m10_2 = 0, - .m12_2 = 0 - }; - memcpy(bts->mr_half.gsm48_ie, &mr_cfg, sizeof(bts->mr_half.gsm48_ie)); - bts->mr_half.ms_mode[0].mode = 0; - bts->mr_half.ms_mode[1].mode = 2; - bts->mr_half.ms_mode[2].mode = 4; - bts->mr_half.ms_mode[3].mode = 7; - bts->mr_half.bts_mode[0].mode = 0; - bts->mr_half.bts_mode[1].mode = 2; - bts->mr_half.bts_mode[2].mode = 4; - bts->mr_half.bts_mode[3].mode = 7; - for (i = 0; i < 3; i++) { - bts->mr_half.ms_mode[i].hysteresis = 8; - bts->mr_half.ms_mode[i].threshold = 32; - bts->mr_half.bts_mode[i].hysteresis = 8; - bts->mr_half.bts_mode[i].threshold = 32; - } + memcpy(&bts->mr_half.ms_mode[0], &amr_ms_bts_mode[0], sizeof(amr_ms_bts_mode)); + memcpy(&bts->mr_half.bts_mode[0], &amr_ms_bts_mode[0], sizeof(amr_ms_bts_mode)); bts->mr_half.num_modes = 3; bts_init_cbch_state(&bts->cbch_basic, bts); -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27744 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I3d03c2188d007a60a86961a346744400bc81d4e6 Gerrit-Change-Number: 27744 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(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, 2 months

1
0
0 0

Change in osmo-bts[master]: rsl: parse_multirate_config(): check if AMR codec is used

by fixeria

Attention is currently required from: laforge, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/27755 ) Change subject: rsl: parse_multirate_config(): check if AMR codec is used ...................................................................... Patch Set 1: Code-Review+2 (2 comments) Commit Message: https://gerrit.osmocom.org/c/osmo-bts/+/27755/comment/b090ccb7_87a97951 PS1, Line 10: and states that it's "included if the Channel Mode indicates that a > the spec lists it as "O" and not as "C", so while it makes little sense, it is optional... The fact that it's optional and can be omitted makes me wonder if there is a way to send a default MultiRate configuration to a BTS once, and then omit it in the CHAN ACT/MODIFY, just like we do with the MS/BS Power Parameters. It's not like we're using unique multi-rate configurations for individual channels... Patchset: PS1: 1+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/27755 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I6ddc0b46a268ed56ac727cda57d0d68b2746fd59 Gerrit-Change-Number: 27755 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(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: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 12 Apr 2022 15:58:08 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

3 years, 2 months

1
0
0 0

Change in osmo-uecups[master]: Add optarg support

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-uecups/+/27746 ) Change subject: Add optarg support ...................................................................... Add optarg support Change-Id: I88c95c27d20f1da8dc2ce967197b58c876b42c59 --- M daemon/main.c 1 file changed, 96 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve daniel: Looks good to me, approved diff --git a/daemon/main.c b/daemon/main.c index 014e28a..9f1885f 100644 --- a/daemon/main.c +++ b/daemon/main.c @@ -1,4 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0 */ +#define _GNU_SOURCE +#include <getopt.h> #include <unistd.h> #include <stdint.h> #include <stdbool.h> @@ -752,6 +754,98 @@ .num_cat = ARRAY_SIZE(log_categories), }; +static void print_help() +{ + printf("Some useful options:\n"); + printf(" -h --help is printing this text.\n"); + printf(" -c --config-file filename The config file to use.\n"); + printf(" -s --disable-color\n"); + printf(" -D --daemonize Fork the process into a background daemon\n"); + printf(" -V --version Print the version number\n"); + + printf("\nVTY reference generation:\n"); + printf(" --vty-ref-mode MODE VTY reference generation mode (e.g. 'expert').\n"); + printf(" --vty-ref-xml Generate the VTY reference XML output and exit.\n"); +} + +static void handle_long_options(const char *prog_name, const int long_option) +{ + static int vty_ref_mode = VTY_REF_GEN_MODE_DEFAULT; + + switch (long_option) { + case 1: + vty_ref_mode = get_string_value(vty_ref_gen_mode_names, optarg); + if (vty_ref_mode < 0) { + fprintf(stderr, "%s: Unknown VTY reference generation " + "mode '%s'\n", prog_name, optarg); + exit(2); + } + break; + case 2: + fprintf(stderr, "Generating the VTY reference in mode '%s' (%s)\n", + get_value_string(vty_ref_gen_mode_names, vty_ref_mode), + get_value_string(vty_ref_gen_mode_desc, vty_ref_mode)); + vty_dump_xml_ref_mode(stdout, (enum vty_ref_gen_mode) vty_ref_mode); + exit(0); + default: + fprintf(stderr, "%s: error parsing cmdline options\n", prog_name); + exit(2); + } +} + +static void handle_options(int argc, char **argv) +{ + while (1) { + int option_index = 0, c; + static int long_option = 0; + static struct option long_options[] = { + {"help", 0, 0, 'h'}, + {"config-file", 1, 0, 'c'}, + {"daemonize", 0, 0, 'D'}, + {"version", 0, 0, 'V'}, + {"disable-color", 0, 0, 's'}, + {"vty-ref-mode", 1, &long_option, 1}, + {"vty-ref-xml", 0, &long_option, 2}, + {0, 0, 0, 0}, + }; + + c = getopt_long(argc, argv, "hc:sVD", long_options, &option_index); + + if (c == -1) + break; + + switch (c) { + case 'h': + print_help(); + exit(0); + break; + case 0: + handle_long_options(argv[0], long_option); + break; + case 'c': + g_config_file = talloc_strdup(g_tall_ctx, optarg); + break; + case 's': + log_set_use_color(osmo_stderr_target, 0); + break; + case 'V': + print_version(1); + exit(0); + break; + case 'D': + g_daemonize = 1; + break; + default: + /* ignore */ + break; + }; + } + if (argc > optind) { + fprintf(stderr, "Unsupported positional arguments on command line\n"); + exit(2); + } +} + int main(int argc, char **argv) { int rc; @@ -775,6 +869,8 @@ rate_ctr_init(g_tall_ctx); gtpud_vty_init(); + handle_options(argc, argv); + init_netns(); rc = vty_read_config_file(g_config_file, NULL); -- To view, visit https://gerrit.osmocom.org/c/osmo-uecups/+/27746 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-uecups Gerrit-Branch: master Gerrit-Change-Id: I88c95c27d20f1da8dc2ce967197b58c876b42c59 Gerrit-Change-Number: 27746 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

3 years, 2 months

1
0
0 0

Change in osmo-e1d[master]: vty: Print only applicable information during 'show line'

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/27719 ) Change subject: vty: Print only applicable information during 'show line' ...................................................................... vty: Print only applicable information during 'show line' If the line is in channelized mode, only print per-TS information. If the line is in superchannel mode, only print SC information. This avoids printing information that is not applicable to the line mode. Change-Id: I7b55ae8a5e1d352f90e14342d7f7e82e4848118a --- M src/vty.c 1 file changed, 17 insertions(+), 8 deletions(-) Approvals: Jenkins Builder: Verified tnt: Looks good to me, but someone else must approve pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/vty.c b/src/vty.c index ba6b1ac..65eb334 100644 --- a/src/vty.c +++ b/src/vty.c @@ -170,15 +170,24 @@ line->ts0.cur_errmask & E1L_TS0_RX_CRC4_ERR ? " [REMOTE-CRC-ERROR]" : "", VTY_NEWLINE); - for (tn = 0; tn < ARRAY_SIZE(line->ts); tn++) { - const struct e1_ts *ts = &line->ts[tn]; - vty_out(vty, " TS%02u: Mode %s, FD %d, Peer PID %d%s", - ts->id, get_value_string(e1_ts_mode_names, ts->mode), - ts->fd, get_remote_pid(ts->fd), VTY_NEWLINE); + switch (line->mode) { + case E1_LINE_MODE_CHANNELIZED: + for (tn = 0; tn < ARRAY_SIZE(line->ts); tn++) { + const struct e1_ts *ts = &line->ts[tn]; + vty_out(vty, " TS%02u: Mode %s, FD %d, Peer PID %d%s", + ts->id, get_value_string(e1_ts_mode_names, ts->mode), + ts->fd, get_remote_pid(ts->fd), VTY_NEWLINE); + } + break; + case E1_LINE_MODE_SUPERCHANNEL: + vty_out(vty, " SC: Mode %s, FD %d, Peer PID %d%s", + get_value_string(e1_ts_mode_names, line->superchan.mode), + line->superchan.fd, get_remote_pid(line->superchan.fd), VTY_NEWLINE); + break; + case E1_LINE_MODE_E1OIP: + /* TODO: dump some information about E1oIP */ + break; } - vty_out(vty, " SC: Mode %s, FD %d, Peer PID %d%s", - get_value_string(e1_ts_mode_names, line->superchan.mode), - line->superchan.fd, get_remote_pid(line->superchan.fd), VTY_NEWLINE); vty_out_rate_ctr_group(vty, " ", line->ctrs); } -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/27719 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: I7b55ae8a5e1d352f90e14342d7f7e82e4848118a Gerrit-Change-Number: 27719 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: manawyrm <osmocom.account(a)tbspace.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: tnt <tnt(a)246tNt.com> Gerrit-MessageType: merged

3 years, 2 months

1
0
0 0

Change in osmo-e1d[master]: vty: Print only applicable information during 'show line'

by laforge

Attention is currently required from: manawyrm. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/27719 ) Change subject: vty: Print only applicable information during 'show line' ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/27719 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: I7b55ae8a5e1d352f90e14342d7f7e82e4848118a Gerrit-Change-Number: 27719 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: manawyrm <osmocom.account(a)tbspace.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: tnt <tnt(a)246tNt.com> Gerrit-Attention: manawyrm <osmocom.account(a)tbspace.de> Gerrit-Comment-Date: Tue, 12 Apr 2022 15:26:28 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 2 months

1
0
0 0

Change in osmo-uecups[master]: Add optarg support

by daniel

Attention is currently required from: osmith, pespin. daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-uecups/+/27746 ) Change subject: Add optarg support ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-uecups/+/27746 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-uecups Gerrit-Branch: master Gerrit-Change-Id: I88c95c27d20f1da8dc2ce967197b58c876b42c59 Gerrit-Change-Number: 27746 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 12 Apr 2022 15:26:01 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 2 months

1
0
0 0

Change in osmo-bsc[master]: hodec2: apply penalty_low_rxqual_as only on assignment

by pespin

Attention is currently required from: neels, keith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27759 ) Change subject: hodec2: apply penalty_low_rxqual_as only on assignment ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27759 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ifdb9891fbe7e3f3423a96371def4fcbf2fc0bc0d Gerrit-Change-Number: 27759 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> 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-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: keith <keith(a)rhizomatica.org> Gerrit-Comment-Date: Tue, 12 Apr 2022 14:41:14 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 2 months

1
0
0 0

Change in osmo-bsc[master]: hodec2: apply penalty_low_rxqual_as only on assignment

by laforge

Attention is currently required from: neels, keith. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27759 ) Change subject: hodec2: apply penalty_low_rxqual_as only on assignment ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27759 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ifdb9891fbe7e3f3423a96371def4fcbf2fc0bc0d Gerrit-Change-Number: 27759 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith <keith(a)rhizomatica.org> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: keith <keith(a)rhizomatica.org> Gerrit-Comment-Date: Tue, 12 Apr 2022 14:26:42 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 2 months

1
0
0 0

2025

2024

2023

2022

gerrit-log April 2022