[S] Change in libosmo-abis[master]: e1d: Remove useless call of handle_ts_trau_write()
Attention is currently required from: pespin. jolly has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/31501 ) Change subject: e1d: Remove useless call of handle_ts_trau_write() .. Patch Set 2: (1 comment) File src/input/e1d.c: https://gerrit.osmocom.org/c/libosmo-abis/+/31501/comment/fee0c67b_39301827 PS1, Line 278: ret = handle_ts_trau_read(bfd); > Better leave a comment stating that OSMO_FW_WRITE is never set, or even > OSMO_ASSERT() Done -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/31501 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: Iccddcdb0975e8a043cc395c8908a157f5b376752 Gerrit-Change-Number: 31501 Gerrit-PatchSet: 2 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-Attention: pespin Gerrit-Comment-Date: Tue, 28 Feb 2023 06:29:17 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment
[S] Change in libosmo-abis[master]: e1d: Remove useless call of handle_ts_trau_write()
Attention is currently required from: jolly. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-abis/+/31501 to look at the new patch set (#2). Change subject: e1d: Remove useless call of handle_ts_trau_write() .. e1d: Remove useless call of handle_ts_trau_write() handle_ts_trau_write() is called inside handle_ts_trau_read(). There is no need to call it when OSMO_FD_WRITE flag is set, because it is never set. Change-Id: Iccddcdb0975e8a043cc395c8908a157f5b376752 --- M src/input/e1d.c 1 file changed, 16 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/01/31501/2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/31501 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: Iccddcdb0975e8a043cc395c8908a157f5b376752 Gerrit-Change-Number: 31501 Gerrit-PatchSet: 2 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-Attention: jolly Gerrit-MessageType: newpatchset
[L] Change in libosmocore[master]: Add libosmocore.map
daniel has submitted this change. (
https://gerrit.osmocom.org/c/libosmocore/+/31173 )
(
3 is the latest approved patch-set.
No files were changed between the latest approved patch-set and the submitted
one.
)Change subject: Add libosmocore.map
..
Add libosmocore.map
Generated with:
nm src/core/.libs/libosmocore.so --defined-only |grep " T \| D \| B " | cut -c
20- >> src/core/libosmocore.map
Change-Id: I13169c00a59fb59513dfc598de5a71d094492422
---
M configure.ac
M src/core/Makefile.am
A src/core/libosmocore.map
3 files changed, 585 insertions(+), 1 deletion(-)
Approvals:
pespin: Looks good to me, but someone else must approve
fixeria: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/configure.ac b/configure.ac
index ecff654..108c0a1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -55,6 +55,7 @@
LTLDFLAGS_OSMOGSM='-Wl,--version-script=$(srcdir)/libosmogsm.map'
LTLDFLAGS_OSMOISDN='-Wl,--version-script=$(srcdir)/libosmoisdn.map'
LTLDFLAGS_OSMOCODING='-Wl,--version-script=$(srcdir)/libosmocoding.map'
+ LTLDFLAGS_OSMOCORE='-Wl,--version-script=$(srcdir)/libosmocore.map'
LTLDFLAGS_OSMOCTRL='-Wl,--version-script=$(srcdir)/libosmoctrl.map'
;;
esac
@@ -62,6 +63,7 @@
AC_SUBST(LTLDFLAGS_OSMOGSM)
AC_SUBST(LTLDFLAGS_OSMOISDN)
AC_SUBST(LTLDFLAGS_OSMOCODING)
+AC_SUBST(LTLDFLAGS_OSMOCORE)
AC_SUBST(LTLDFLAGS_OSMOCTRL)
dnl checks for header files
diff --git a/src/core/Makefile.am b/src/core/Makefile.am
index 0965204..7e24013 100644
--- a/src/core/Makefile.am
+++ b/src/core/Makefile.am
@@ -108,9 +108,14 @@
conv_acc_neon_impl.h \
crcXXgen.c.tpl \
stat_item_internal.h \
+ libosmocore.map \
$(NULL)
-libosmocore_la_LDFLAGS = -version-info $(LIBVERSION) -no-undefined
+libosmocore_la_LDFLAGS = \
+ $(LTLDFLAGS_OSMOCORE) \
+ -version-info \
+ $(LIBVERSION) \
+ -no-undefined
if ENABLE_PLUGIN
libosmocore_la_SOURCES += plugin.c
diff --git a/src/core/libosmocore.map b/src/core/libosmocore.map
new file mode 100644
index 000..16b7261
--- /dev/null
+++ b/src/core/libosmocore.map
@@ -0,0 +1,565 @@
+LIBOSMOCORE_1.0 {
+global:
+
+assert_loginfo;
+bit_value_to_char;
+bitvec_add_array;
+bitvec_alloc;
+bitvec_fill;
+bitvec_find_bit_pos;
+bitvec_free;
+bitvec_get_bit_high;
+bitvec_get_bit_pos;
+bitvec_get_bit_pos_high;
+bitvec_get_bytes;
+bitvec_get_int16_msb;
+bitvec_get_nth_set_bit;
+bitvec_get_uint;
+bitvec_pack;
+bitvec_read_field;
+bitvec_rl;
+bitvec_rl_curbit;
+bitvec_set_bit;
+bitvec_set_bit_pos;
+bitvec_set_bits;
+bitvec_set_bytes;
+bitvec_set_u64;
+bitvec_set_uint;
+bitvec_shiftl;
+bitvec_spare_padding;
+bitvec_to_string_r;
+bitvec_unhex;
+bitvec_unpack;
+bitvec_write_field;
+bitvec_zero;
+chantype_gsmtap2rsl;
+chantype_rsl2gsmtap;
+chantype_rsl2gsmtap2;
+get_string_value;
+get_value_string;
+get_value_string_or_null;
+gsmtap_gsm_channel_names;
+gsmtap_makemsg;
+gsmtap_makemsg_ex;
+gsmtap_send;
+gsmtap_send_ex;
+gsmtap_sendmsg;
+gsmtap_sendmsg_free;
+gsmtap_source_add_sink;
+gsmtap_source_add_sink_fd;
+gsmtap_source_free;
+gsmtap_source_init;
+gsmtap_source_init_fd;
+gsmtap_type_names;
+log_add_target;
+log_category_name;
+log_check_level;
+log_del_target;
+log_enable_multithread;
+log_fini;
+log_init;
+log_level_str;
+loglevel_strs;
+logp;
+logp2;
+log_parse_category;
+log_parse_category_mask;
+log_parse_level;
+logp_stub;
+log_reset_context;
+log_set_all_filter;
+log_set_category_filter;
+log_set_context;
+log_set_log_level;
+log_set_print_category;
+log_set_print_category_hex;
+log_set_print_extended_timestamp;
+log_set_print_filename;
+log_set_print_filename2;
+log_set_print_filename_pos;
+log_set_print_level;
+log_set_print_tid;
+log_set_print_timestamp;
+log_set_use_color;
+log_target_create;
+log_target_create_file;
+log_target_create_file_stream;
+log_target_create_gsmtap;
+log_target_create_rb;
+log_target_create_stderr;
+log_target_create_syslog;
+log_target_create_systemd;
+log_target_destroy;
+log_target_file_reopen;
+log_target_file_switch_to_stream;
+log_target_file_switch_to_wqueue;
+log_target_find;
+log_target_rb_avail_size;
+log_target_rb_get;
+log_target_rb_used_size;
+log_target_systemd_set_raw;
+log_targets_reopen;
+log_tgt_mutex_lock_impl;
+log_tgt_mutex_unlock_impl;
+msgb_alloc;
+msgb_alloc_c;
+msgb_copy;
+msgb_copy_c;
+msgb_copy_resize;
+msgb_copy_resize_c;
+msgb_data;
+msgb_dequeue;
+msgb_enqueue;
+_msgb_eq;
+msgb_free;
+msgb_hexdump;
+msgb_hexdump_buf;
+msgb_hexdump_c;
+msgb_length;
+msgb_printf;
+msgb_reset;
+msgb_resize_area;
+msgb_set_talloc_ctx;
+msgb_talloc_ctx_init;
+osmo_base64_decode;
+osmo_base64_encode;
+osmo_bcd2char;
+osmo_bcd2str;
+osmo_bit_reversal;
+osmo_char2bcd;
+osmo_clock_gettime;
+osmo_clock_override_add;
+osmo_clock_override_enable;
+osmo_clock_override_gettimespec;
+osmo_close_all_fds_above;
[L] Change in libosmocore[master]: fix gsm0808_sc_cfg <-> gsm48_mr_cfg conversion
Attention is currently required from: neels, laforge, pespin, dexter. Hello Jenkins Builder, dexter, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/29475 to look at the new patch set (#4). Change subject: fix gsm0808_sc_cfg <-> gsm48_mr_cfg conversion .. fix gsm0808_sc_cfg <-> gsm48_mr_cfg conversion Deprecate gsm0808_sc_cfg_from_gsm48_mr_cfg() and gsm48_mr_cfg_from_gsm0808_sc_cfg(), and add new functions gsm0808_sc_cfg_from_amr_modes() and gsm0808_sc_cfg_get_best_amr_modes() to fix the behavior as follows: When the mr_cfg enables a specific rate, do not include all AMR configurations that feature this rate. Instead, enable only those configurations that are a subset of the mr_cfg. For example, in the old functions, setting only m4_75 = 1 would result in enabling all of S0, S8, S9, S10, S12, S14. S14 would allow all of 4.75k, 5.9k, 7.95k, 12.2k, instead of limiting to 4.75k only. In the new functions, do not modify the .version and .icmi members, act only on the AMR rates. Changes from old behavior to new behavior is clearly shown in tests/gsm0808/gsm0808_test.ok. Keep the deprecated functions unchanged, yielding incorrect behavior, and let the API users decide when and how to upgrade to the more sane behavior. For example, changing the behavior of existing functions in-place would have repercussions on osmo-bsc installations, where now only those AMR modes listed in the config would be used -- we are becoming stricter. Possibly this would deteriorate or break sites alone from upgrading libosmocore -- i.e. those sites that fail to list an essential AMR rate for matching with peers, but where that essential AMR rate was erratically allowed by the old behavior. The old behavior, by example of osmo-bsc: - Picking rates in osmo-bsc.cfg has non-obvious effects, often including rates that are configured as 'forbidden'. - If any of 4.75, 5.90, 7.40, 12.2 is enabled in osmo-bsc.cfg, the configuration S1 ends up enabled in s15_s0 (gsm0808_sc_cfg_from_gsm48_mr_cfg()). - In gsm48_mr_cfg_from_gsm0808_sc_cfg() used during channel activation, if S1 is present, the four rates from S1 are returned. - In summary, in the vast majority of cases, the S1 set will be used -- even if only one of its AMR rates is originally present in mr_cfg. - Configurations above S7 are ignored. The new behavior, assuming osmo-bsc moved to the more sane implementation introduced in this patch: - Only one of the rate combinations defined by S0..S15 is going to be used. This is mainly because AMR rate selections are sent to the MSC and back from the MSC in the somewhat limited S0..S15 bit form. Enabling one or more of these combinations of rates in osmo-bsc.cfg makes sense: - 4.75, 5.90, 7.40, 12.2 (S1) - 4.75, 5.90 (S8) - 4.75, 5.90, 6.70 (S9) - 4.75, 5.90, 6.70, 7.40 (S10) - 4.75, 5.90, 6.70, 10.2 (S12) - 4.75, 5.90, 7.95, 12.2 (S14) - e.g. if only 4.75 is enabled, only 4.75 is used (S0). - e.g. in case of 6.70=allowed + 7.75=allowed + 10.2=allowed, we have to choose between "only 6.70", "only 7.75", "only 10.2". On FR we'd pick S6 = "only 10.2", because it is the highest rate. So osmo-bsc.cfg should rather choose rates exactly matching a specific Sn bit, e.g. all rates of S12, to obtain a flexible variety of AMR rates. 3GPP TS 48.008 3.2.2.103 'Speech Codec List' says to this: NOTE: One of these Codec Configurations, "Config-NB-Code 1" = S1, is recommended for TrFO [Transcoder Free Operation]. S14 also seems a good choice, it is like S1 but with 7k95 instead of 7k40; 7k95 is the highest possible AMR-HR rate. It is not clear at this point why S1 seems to be preferred over S14. Ironically, the old behavior would usually end up selecting exactly S1 in almost every case, which is what 3GPP TS 48.008 3.2.2.103 recommends. This is, however, not obvious to the caller / the site admin. Related: SYS#5066 Change-Id: I900fda192742fa8f6dd54e9131ef1704b14cc41a --- M TODO-RELEASE M include/osmocom/gsm/gsm0808_utils.h M include/osmocom/gsm/protocol/gsm_04_08.h M src/gsm/gsm0808_utils.c M src/gsm/libosmogsm.map M tests/gsm0808/gsm0808_test.c M tests/gsm0808/gsm0808_test.ok 7 files changed, 300 insertions(+), 170 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/75/29475/4 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/29475 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I900fda192742fa8f6dd54e9131ef1704b14cc41a Gerrit-Change-Number: 29475 Gerrit-PatchSet: 4 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-CC: laforge Gerrit-CC: pespin Gerrit-Attention: neels Gerrit-Attention: laforge Gerrit-Attention: pespin Gerrit-Attention: dexter Gerrit-MessageType: newpatchset
[L] Change in libosmocore[master]: fix gsm0808_sc_cfg <-> gsm48_mr_cfg conversion
Attention is currently required from: neels, laforge, pespin, dexter. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/29475 ) Change subject: fix gsm0808_sc_cfg <-> gsm48_mr_cfg conversion .. Patch Set 3: (4 comments) Commit Message: https://gerrit.osmocom.org/c/libosmocore/+/29475/comment/0567b865_547d3b2e PS2, Line 17: gsm0808_sc_cfg_from_modes() and > added "_amr" Done File src/gsm/gsm0808_utils.c: https://gerrit.osmocom.org/c/libosmocore/+/29475/comment/55be7e5f_b3466146 PS1, Line 1659: uint8_t gsm0808_sc_cfg_get_best_modes(uint16_t s15_s0, bool full_rate) > makes sense, yes actually "best" refers to the "best Sn combination", not the highest rate. For example, S1 is considered better than S0 and S2 thru S9, because it has a range of different rates, etc File src/gsm/gsm0808_utils.c: https://gerrit.osmocom.org/c/libosmocore/+/29475/comment/111a8389_a7323a59 PS2, Line 1612: if (s_modes && ((s_modes & modes) == s_modes)) > it is possible, for example some modes are disabled for HR, […] Done https://gerrit.osmocom.org/c/libosmocore/+/29475/comment/56bea5ef_1d06689d PS2, Line 1635: if (!(s15_s0 & s_bit)) > thanks, nice catch. Done -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/29475 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I900fda192742fa8f6dd54e9131ef1704b14cc41a Gerrit-Change-Number: 29475 Gerrit-PatchSet: 3 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-CC: laforge Gerrit-CC: pespin Gerrit-Attention: neels Gerrit-Attention: laforge Gerrit-Attention: pespin Gerrit-Attention: dexter Gerrit-Comment-Date: Tue, 28 Feb 2023 00:24:13 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: neels Comment-In-Reply-To: laforge Comment-In-Reply-To: pespin Gerrit-MessageType: comment
[L] Change in libosmocore[master]: fix gsm0808_sc_cfg <-> gsm48_mr_cfg conversion
Attention is currently required from: laforge, pespin, dexter.
neels has posted comments on this change. (
https://gerrit.osmocom.org/c/libosmocore/+/29475 )
Change subject: fix gsm0808_sc_cfg <-> gsm48_mr_cfg conversion
..
Patch Set 3:
(2 comments)
This change is ready for review.
Commit Message:
https://gerrit.osmocom.org/c/libosmocore/+/29475/comment/9f678baa_a0111597
PS2, Line 17: gsm0808_sc_cfg_from_modes() and
> Ack
added "_amr"
File include/osmocom/gsm/protocol/gsm_04_08.h:
https://gerrit.osmocom.org/c/libosmocore/+/29475/comment/c03f4fd6_98f076e0
PS2, Line 627: return ((uint8_t *)cfg)[1];
> can you better add a union with a field containing the whole octet in the
> struct gsm48_multi_rate_co […]
gsm48_multi_rate_conf has two uint8_t members, AFAICT adding a union would
require adding another explicit name for the union. That would be API breakage.
This function works around that...
struct gsm48_multi_rate_conf {
#if OSMO_IS_LITTLE_ENDIAN
uint8_t smod : 2,
spare: 1,
icmi : 1,
nscb : 1,
ver : 3;
uint8_t m4_75 : 1,
m5_15 : 1,
m5_90 : 1,
m6_70 : 1,
m7_40 : 1,
m7_95 : 1,
m10_2 : 1,
m12_2 : 1;
#elif OSMO_IS_BIG_ENDIAN
/* auto-generated from the little endian part above
(libosmocore/contrib/struct_endianness.py) */
uint8_t ver:3, nscb:1, icmi:1, spare:1, smod:2;
uint8_t m12_2:1, m10_2:1, m7_95:1, m7_40:1, m6_70:1, m5_90:1, m5_15:1,
m4_75:1;
#endif
} __attribute__((packed));
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/29475
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I900fda192742fa8f6dd54e9131ef1704b14cc41a
Gerrit-Change-Number: 29475
Gerrit-PatchSet: 3
Gerrit-Owner: neels
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: dexter
Gerrit-CC: laforge
Gerrit-CC: pespin
Gerrit-Attention: laforge
Gerrit-Attention: pespin
Gerrit-Attention: dexter
Gerrit-Comment-Date: Tue, 28 Feb 2023 00:22:16 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: laforge
Comment-In-Reply-To: pespin
Gerrit-MessageType: comment
[L] Change in libosmocore[master]: improve test output for gsm0808_sc_cfg_from_gsm48_mr_cfg()
Attention is currently required from: laforge, pespin, dexter. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/29474 ) Change subject: improve test output for gsm0808_sc_cfg_from_gsm48_mr_cfg() .. Patch Set 3: Code-Review+2 (1 comment) Patchset: PS3: add previous votes after trivial tweak -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/29474 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Iec7c491d9fadd37d9e43fbaac8e709c2029f8a8e Gerrit-Change-Number: 29474 Gerrit-PatchSet: 3 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Attention: laforge Gerrit-Attention: pespin Gerrit-Attention: dexter Gerrit-Comment-Date: Tue, 28 Feb 2023 00:21:40 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[L] Change in libosmocore[master]: improve test output for gsm0808_sc_cfg_from_gsm48_mr_cfg()
Attention is currently required from: laforge, pespin, dexter. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/29474 ) Change subject: improve test output for gsm0808_sc_cfg_from_gsm48_mr_cfg() .. Patch Set 3: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/29474 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Iec7c491d9fadd37d9e43fbaac8e709c2029f8a8e Gerrit-Change-Number: 29474 Gerrit-PatchSet: 3 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: laforge Gerrit-Attention: pespin Gerrit-Attention: dexter Gerrit-Comment-Date: Tue, 28 Feb 2023 00:21:22 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
[M] Change in libosmocore[master]: add gsm0808_amr_modes_from_cfg
Attention is currently required from: laforge, pespin, dexter. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/29473 ) Change subject: add gsm0808_amr_modes_from_cfg .. Patch Set 3: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/29473 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Icef7dd626d3d4641c66b8dd87e2047fc0ab547d1 Gerrit-Change-Number: 29473 Gerrit-PatchSet: 3 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: laforge Gerrit-Attention: pespin Gerrit-Attention: dexter Gerrit-Comment-Date: Tue, 28 Feb 2023 00:21:03 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
[M] Change in osmo-bsc[master]: utils: store more fields from meas-feed in db
Attention is currently required from: iedemam. Hello Jenkins Builder, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/31538 to look at the new patch set (#3). Change subject: utils: store more fields from meas-feed in db .. utils: store more fields from meas-feed in db More fields need to be captured from meas-feed to perform meaningful analysis of data from multi-bts and multi-trx systems. This patch adds expands the existing db utils to record nearly all available fields from meas-feed. Change-Id: I509c939524b11a4ee455bcfc3ebee6c5c35b9fba --- M src/utils/meas_db.c M src/utils/meas_db.h M src/utils/meas_pcap2db.c M src/utils/meas_udp2db.c 4 files changed, 80 insertions(+), 56 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/38/31538/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/31538 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I509c939524b11a4ee455bcfc3ebee6c5c35b9fba Gerrit-Change-Number: 31538 Gerrit-PatchSet: 3 Gerrit-Owner: iedemam Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Attention: iedemam Gerrit-MessageType: newpatchset
[M] Change in osmo-bsc[master]: utils: store more fields from meas-feed in db
Attention is currently required from: iedemam. Jenkins Builder has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/31538 ) Change subject: utils: store more fields from meas-feed in db .. Patch Set 2: (2 comments) File src/utils/meas_db.c: Robot Comment from checkpatch (run ID jenkins-gerrit-lint-4123): https://gerrit.osmocom.org/c/osmo-bsc/+/31538/comment/5bf2a389_1382630b PS2, Line 149:0, >mr.dl); code indent should use tabs where possible Robot Comment from checkpatch (run ID jenkins-gerrit-lint-4123): https://gerrit.osmocom.org/c/osmo-bsc/+/31538/comment/3f34c58e_ea2f63b0 PS2, Line 149:0, >mr.dl); please, no space before tabs -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/31538 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I509c939524b11a4ee455bcfc3ebee6c5c35b9fba Gerrit-Change-Number: 31538 Gerrit-PatchSet: 2 Gerrit-Owner: iedemam Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Attention: iedemam Gerrit-Comment-Date: Mon, 27 Feb 2023 22:46:14 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
[M] Change in osmo-bsc[master]: utils: store more fields from meas-feed in db
Attention is currently required from: iedemam. Hello Jenkins Builder, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/31538 to look at the new patch set (#2). Change subject: utils: store more fields from meas-feed in db .. utils: store more fields from meas-feed in db More fields need to be captured from meas-feed to perform meaningful analysis of data from multi-bts and multi-trx systems. This patch adds expands the existing db utils to record nearly all available fields from meas-feed. Change-Id: I509c939524b11a4ee455bcfc3ebee6c5c35b9fba --- M src/utils/meas_db.c M src/utils/meas_db.h M src/utils/meas_pcap2db.c M src/utils/meas_udp2db.c 4 files changed, 80 insertions(+), 56 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/38/31538/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/31538 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I509c939524b11a4ee455bcfc3ebee6c5c35b9fba Gerrit-Change-Number: 31538 Gerrit-PatchSet: 2 Gerrit-Owner: iedemam Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Attention: iedemam Gerrit-MessageType: newpatchset
[S] Change in libosmocore[master]: contrib/struct_endianness.py: simplify file extension check
Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/31580 ) Change subject: contrib/struct_endianness.py: simplify file extension check .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/31580 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Iaf7194fdfc3772973f9a9c806d375a9a56ff57c8 Gerrit-Change-Number: 31580 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Attention: fixeria Gerrit-Comment-Date: Mon, 27 Feb 2023 21:25:13 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-bsc[master]: abis_rsl: assert maximum length
Attention is currently required from: dexter. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/31577 ) Change subject: abis_rsl: assert maximum length .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/31577 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I9417b35fb8c0517f2555e17059bf8ac60fa59791 Gerrit-Change-Number: 31577 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Attention: dexter Gerrit-Comment-Date: Mon, 27 Feb 2023 21:19:56 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in osmo-bsc[master]: pcu_sock: improve logging
Attention is currently required from: dexter. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/31579 ) Change subject: pcu_sock: improve logging .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/31579 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I4a3ff23ffccf803b1a97e3f2604d3b422c6d6afd Gerrit-Change-Number: 31579 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Attention: dexter Gerrit-Comment-Date: Mon, 27 Feb 2023 21:18:54 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-bsc[master]: pcu_sock: print OML alerts from PCU
Attention is currently required from: fixeria, dexter. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/31499 ) Change subject: pcu_sock: print OML alerts from PCU .. Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/31499 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Id32553556356c2affe32e47ae1c3ae6a514efdce Gerrit-Change-Number: 31499 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Attention: fixeria Gerrit-Attention: dexter Gerrit-Comment-Date: Mon, 27 Feb 2023 21:18:14 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in libosmocore[master]: doxygen: fix various typos in commands \param and \returns
fixeria has uploaded this change for review. (
https://gerrit.osmocom.org/c/libosmocore/+/31582 )
Change subject: doxygen: fix various typos in commands \param and \returns
..
doxygen: fix various typos in commands \param and \returns
Change-Id: If87cec3739449c6a54e24fb2cb81e746d8244da2
---
M src/codec/ecu.c
M src/core/exec.c
M src/core/mnl.c
M src/ctrl/control_if.c
M src/gb/gprs_ns.c
M src/gb/gprs_ns2_message.c
M src/gsm/gsm0411_utils.c
M src/gsm/gsm48_ie.c
M src/gsm/lapdm.c
M src/gsm/tlv_parser.c
M src/isdn/i460_mux.c
11 files changed, 23 insertions(+), 14 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/82/31582/1
diff --git a/src/codec/ecu.c b/src/codec/ecu.c
index 59194ae..def72e6 100644
--- a/src/codec/ecu.c
+++ b/src/codec/ecu.c
@@ -44,7 +44,7 @@
/*! initialize an ECU instance for given codec.
* \param[in] ctx talloc context from which to allocate
- * \parma[in] codec codec for which to initialize/create ECU */
+ * \param[in] codec codec for which to initialize/create ECU */
struct osmo_ecu_state *osmo_ecu_init(void *ctx, enum osmo_ecu_codec codec)
{
if (codec >= ARRAY_SIZE(g_ecu_ops))
diff --git a/src/core/exec.c b/src/core/exec.c
index fd63d85..6412270 100644
--- a/src/core/exec.c
+++ b/src/core/exec.c
@@ -74,7 +74,7 @@
*
* Constraints: Keys up to a maximum length of 255 characters are supported.
*
- * \oaram[out] out caller-allocated array of pointers for the generated output
+ * \param[out] out caller-allocated array of pointers for the generated output
* \param[in] out_len size of out (number of pointers)
* \param[in] in input environment (NULL-terminated list of pointers like
**environ)
* \param[in] whitelist whitelist of permitted keys in environment (like
**environ)
@@ -131,7 +131,7 @@
* Constraints: If the same key exists in 'out' and 'in', duplicate keys are
* generated. It is a simple append, without any duplicate checks.
*
- * \oaram[out] out caller-allocated array of pointers for the generated output
+ * \param[out] out caller-allocated array of pointers for the generated output
* \param[in] out_len size of out (number of pointers)
* \param[in] in input environment (NULL-terminated list of pointers like
**environ)
* \returns number of entries filled in 'out'; negative on error */
diff --git a/src/core/mnl.c b/src/core/mnl.c
index c3f5fe6..d148e1b 100644
--- a/src/core/mnl.c
+++ b/src/core/mnl.c
@@ -54,7 +54,7 @@
}
/*! create an osmocom-wrapped limnl netlink socket.
- * \parma[in] ctx talloc context from which to allocate
+ * \param[in] ctx talloc context from which to allocate
* \param[in] bus netlink socket bus ID (see NETLINK_* constants)
* \param[in] groups groups of messages to bind/subscribe to
* \param[in] mnl_cb callback function called for each incoming message
diff --git a/src/ctrl/control_if.c b/src/ctrl/control_if.c
index 9438f7e..94b8975 100644
--- a/src/ctrl/control_if.c
+++ b/src/ctrl/control_if.c
@@ -96,7 +96,7 @@
/*! Send a CTRL command to all connections.
* \param[in] ctrl global control handle
- * \param[in] cmd command to send to all connections in \ctrl
+ * \param[in] cmd command to send to all connections in ctrl
* \returns number of times the command has been sent */
int ctrl_cmd_send_to_all(struct ctrl_handle *ctrl, struct ctrl_cmd *cmd)
{
@@ -1048,7 +1048,7 @@
* This function is used by e.g. library code to install lookup helpers
* for additional nodes in the control interface.
* \param[in] lookup The lookup helper function
- * \retuns - on success; negative on error.
+ * \returns - on success; negative on error.
*/
int ctrl_lookup_register(ctrl_cmd_lookup lookup)
{
diff --git a/src/gb/gprs_ns.c b/src/gb/gprs_ns.c
index e250eda..304fe7c 100644
--- a/src/gb/gprs_ns.c
+++ b/src/gb/gprs_ns.c
@@ -532,7 +532,7 @@
/*! Transmit a NS-RESET on a given NSVC
* \param[in] nsvc NS-VC used for transmission
- * \paam[in] cause Numeric NS cause value
+ * \param[in] cause Numeric NS cause value
*/
int gprs_ns_tx_reset(struct gprs_nsvc *nsvc, uint8_t cause)
{
diff --git a/src/gb/gprs_ns2_message.c b/src/gb/gprs_ns2_message.c
index cc95334..1b986fe 100644
--- a/src/gb/gprs_ns2_message.c
+++ b/src/gb/gprs_ns2_message.c
@@ -282,7 +282,7 @@
/*! Transmit a NS-RESET on a given NS-VC.
* \param[in] nsvc NS-VC used for transmission
- * \paam[in] cause Numeric NS cause value
+ * \param[in] cause Numeric NS cause value
* \returns 0 in case of success */
int ns2_tx_reset(struct gprs_ns2_vc *nsvc, uint8_t cause)
{
diff --git a/src/gsm/gsm0411_utils.c b/src/gsm/gsm0411_utils.c
index c26cd82..470b017 100644
--- a/src/gsm/gsm0411_utils.c
+++ b/src/gsm/gsm0411_utils.c
@@ -293,7 +293,7 @@
* \param[in] type GSM340_TYPE_*
* \param[in] plan Numbering Plan
* \param[in] number string containing number
- * \reurns number of bytes of \a oa that have been used */
+ *
[S] Change in libosmocore[master]: contrib/struct_endianness.py: simplify file extension check
fixeria has uploaded this change for review. (
https://gerrit.osmocom.org/c/libosmocore/+/31580 )
Change subject: contrib/struct_endianness.py: simplify file extension check
..
contrib/struct_endianness.py: simplify file extension check
Change-Id: Iaf7194fdfc3772973f9a9c806d375a9a56ff57c8
---
M contrib/struct_endianness.py
1 file changed, 10 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/80/31580/1
diff --git a/contrib/struct_endianness.py b/contrib/struct_endianness.py
index 2601869..e6cbe00 100755
--- a/contrib/struct_endianness.py
+++ b/contrib/struct_endianness.py
@@ -261,7 +261,7 @@
return body_str
def _check_file(f):
-if not (f.endswith('.h') or f.endswith('.c') or f.endswith('.cpp')):
+if not f.endswith(('.h', '.c', '.cpp')):
return
# section the file into
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/31580
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: Iaf7194fdfc3772973f9a9c806d375a9a56ff57c8
Gerrit-Change-Number: 31580
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria
Gerrit-MessageType: newchange
[S] Change in libosmocore[master]: doxygen: remove documentation for non-existent params
fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/31581 ) Change subject: doxygen: remove documentation for non-existent params .. doxygen: remove documentation for non-existent params Change-Id: I8b1be37c8fdaa824637d306bdb40a3b78616f614 --- M include/osmocom/ctrl/control_cmd.h 1 file changed, 10 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/81/31581/1 diff --git a/include/osmocom/ctrl/control_cmd.h b/include/osmocom/ctrl/control_cmd.h index 276a7de..1451ffb 100644 --- a/include/osmocom/ctrl/control_cmd.h +++ b/include/osmocom/ctrl/control_cmd.h @@ -234,9 +234,7 @@ * \param[in] cmdname symbol name of the command related function * \param[in] cmdstr string name exposed on CTRL * \param[in] dtype name of outer struct of user data - * \param[in] element name of field within \a dtype - * \param[in] min minimum permitted integer value - * \param[in] max maximum permitted integer value */ + * \param[in] element name of field within \a dtype */ #define CTRL_CMD_DEFINE_STRING(cmdname, cmdstr, dtype, element) \ CTRL_HELPER_GET_STRING(cmdname, dtype, element) \ CTRL_HELPER_SET_STRING(cmdname, dtype, element) \ -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/31581 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I8b1be37c8fdaa824637d306bdb40a3b78616f614 Gerrit-Change-Number: 31581 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange
[XL] Change in osmo-pcu[master]: support for Ericsson RBS E1 CCU
Jenkins Builder has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/31176 ) Change subject: support for Ericsson RBS E1 CCU .. Patch Set 14: (2 comments) File src/ericsson-rbs/er_ccu_l1_if.c: Robot Comment from checkpatch (run ID jenkins-gerrit-lint-4116): https://gerrit.osmocom.org/c/osmo-pcu/+/31176/comment/f0155c85_07b95af8 PS14, Line 241: "afn_ul=%u (computed) != afn_ul=%u (sync-ind) => delta=%u \n", afn_ul, unnecessary whitespace before a quoted newline Robot Comment from checkpatch (run ID jenkins-gerrit-lint-4116): https://gerrit.osmocom.org/c/osmo-pcu/+/31176/comment/452b4156_b709cc25 PS14, Line 246: "afn_dl=%u (computed) != afn_dl=%u (sync-ind) => delta=%u \n", afn_dl, unnecessary whitespace before a quoted newline -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/31176 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I5c0a76667339ca984a12cbd2052f5d9e5b0f9c4d Gerrit-Change-Number: 31176 Gerrit-PatchSet: 14 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-CC: neels Gerrit-Comment-Date: Mon, 27 Feb 2023 19:50:59 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
[XL] Change in osmo-pcu[master]: support for Ericsson RBS E1 CCU
Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-pcu/+/31176 to look at the new patch set (#14). Change subject: support for Ericsson RBS E1 CCU .. support for Ericsson RBS E1 CCU Ericsson RBS series BTSs do not have a built in PCU. Rather than having the PCU on board the PCU is co-located to the BTS in those cases. Just like the MGW the PCU would connect to the CCU (Channel Coding Unit) via E1 line. The PCU is connected via an unix domain socket (pcu_sock) to the BSC to receive RACH requests and to control Paging and TBF assignment. This patch adds all the required functionality to fun an Ercisson RBS in GPRS/EGPRS mode. It supports 16k I.460 E1 subslots and full 64k E1 timeslots (recommended) Change-Id: I5c0a76667339ca984a12cbd2052f5d9e5b0f9c4d Related: OS#5198 --- M configure.ac M src/Makefile.am A src/ericsson-rbs/er_ccu_descr.h A src/ericsson-rbs/er_ccu_if.c A src/ericsson-rbs/er_ccu_if.h A src/ericsson-rbs/er_ccu_l1_if.c A src/ericsson-rbs/er_ccu_l1_if.h M src/gprs_debug.c M src/gprs_debug.h M src/pcu_l1_if.cpp M src/pcu_l1_if.h 11 files changed, 1,142 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/76/31176/14 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/31176 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I5c0a76667339ca984a12cbd2052f5d9e5b0f9c4d Gerrit-Change-Number: 31176 Gerrit-PatchSet: 14 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-CC: neels Gerrit-MessageType: newpatchset
[M] Change in osmo-pcu[master]: bts: add IMMEDIATE ASSIGNMENT via PCH transmission
Attention is currently required from: neels, pespin, fixeria. dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/31145 ) Change subject: bts: add IMMEDIATE ASSIGNMENT via PCH transmission .. Patch Set 17: (2 comments) File src/bts.h: https://gerrit.osmocom.org/c/osmo-pcu/+/31145/comment/16bc6db8_9db56f2e PS16, Line 284: bool use_dt_confirm; > what does "dt" mean? DT stands für "Direct TLLI" that refers to a way where we directly transfer the TLLI instead of using a payload that just contains the TLLI. File src/pcu_l1_if.cpp: https://gerrit.osmocom.org/c/osmo-pcu/+/31145/comment/360a633d_44477aac PS5, Line 320: data[sizeof(tlli) + (PAGING_GROUP_LEN - 1 - i)] > i also dislike the pattern of unreadable encoding magic, especially in the > middle of flow control an […] Ye have discussed this today. I will add a struct for that. -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/31145 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I2a78651593323e8b9627c39918d949a33497b70f Gerrit-Change-Number: 31145 Gerrit-PatchSet: 17 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: neels Gerrit-Attention: neels Gerrit-Attention: pespin Gerrit-Attention: fixeria Gerrit-Comment-Date: Mon, 27 Feb 2023 19:50:23 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: neels Comment-In-Reply-To: fixeria Comment-In-Reply-To: dexter Gerrit-MessageType: comment
[M] Change in osmo-pcu[master]: bts: add IMMEDIATE ASSIGNMENT via PCH transmission
Attention is currently required from: neels, pespin, fixeria. Hello Jenkins Builder, laforge, fixeria, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-pcu/+/31145 to look at the new patch set (#17). Change subject: bts: add IMMEDIATE ASSIGNMENT via PCH transmission .. bts: add IMMEDIATE ASSIGNMENT via PCH transmission In situations where the PCU is co-located to the BSC, the IMMEDIATE ASSIGNMENT for downlink TBFs must be sent via RSL and the BSC also must instruct the BTS to transmit the IMMEDIATE ASSIGNMENT via PCH instead of AGCH. Eventually the BSC must sent a confirmation message (follow-up patch) where the TLLI is used as an identifer. Change-Id: I2a78651593323e8b9627c39918d949a33497b70f Related: OS#5198 --- M include/osmocom/pcu/pcuif_proto.h M src/bts.cpp M src/bts.h M src/pcu_l1_if.cpp M src/pcu_l1_if.h 5 files changed, 65 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/45/31145/17 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/31145 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I2a78651593323e8b9627c39918d949a33497b70f Gerrit-Change-Number: 31145 Gerrit-PatchSet: 17 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: neels Gerrit-Attention: neels Gerrit-Attention: pespin Gerrit-Attention: fixeria Gerrit-MessageType: newpatchset
[XL] Change in osmo-pcu[master]: support for Ericsson RBS E1 CCU
dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/31176 ) Change subject: support for Ericsson RBS E1 CCU .. Patch Set 13: (1 comment) Patchset: PS13: @neels Thanks for reviewing this. I will get to your comments tomorrow. Since there were some changes in patches below I had to update a few code pathes. I will post those changes now. -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/31176 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I5c0a76667339ca984a12cbd2052f5d9e5b0f9c4d Gerrit-Change-Number: 31176 Gerrit-PatchSet: 13 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-CC: neels Gerrit-Comment-Date: Mon, 27 Feb 2023 19:49:32 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
[M] Change in osmo-bsc[master]: pcu_sock: activate/deactivate PDCH on pcu reconnect
Attention is currently required from: neels, fixeria. Jenkins Builder 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 3: (3 comments) File doc/timeslot.msc: Robot Comment from checkpatch (run ID jenkins-gerrit-lint-4114): https://gerrit.osmocom.org/c/osmo-bsc/+/31497/comment/ba02a130_2423fee1 PS3, Line 96: ...; trailing whitespace Robot Comment from checkpatch (run ID jenkins-gerrit-lint-4114): https://gerrit.osmocom.org/c/osmo-bsc/+/31497/comment/1ae70478_5b2dd91c PS3, Line 105: ...; trailing whitespace File include/osmocom/bsc/timeslot_fsm.h: Robot Comment from checkpatch (run ID jenkins-gerrit-lint-4114): https://gerrit.osmocom.org/c/osmo-bsc/+/31497/comment/caa8ebba_51710f35 PS3, Line 46: /* BSC co-located PCU disconnects from PCU socket, deactive PDCH */ 'deactive' may be misspelled - perhaps 'deactivate'? -- 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: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-CC: fixeria Gerrit-Attention: neels Gerrit-Attention: fixeria Gerrit-Comment-Date: Mon, 27 Feb 2023 19:47:55 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
[M] Change in osmo-bsc[master]: pcu_sock: use struct to transfer IMMEDIATE ASSIGNMENT for PCH
Jenkins Builder has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/31578 ) Change subject: pcu_sock: use struct to transfer IMMEDIATE ASSIGNMENT for PCH .. Patch Set 1: (1 comment) File src/osmo-bsc/pcu_sock.c: Robot Comment from checkpatch (run ID jenkins-gerrit-lint-4113): https://gerrit.osmocom.org/c/osmo-bsc/+/31578/comment/08cff42f_354c01ac PS1, Line 575: pch_dt = (struct gsm_pcu_if_pch_dt*)data_req->data; "(foo*)" should be "(foo *)" -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/31578 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Id6acbd243adf26169e5e8319dd66bb68dd6a3c22 Gerrit-Change-Number: 31578 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Mon, 27 Feb 2023 19:47:53 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
[M] Change in osmo-bsc[master]: pcu_sock: improve logging
dexter has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-bsc/+/31579 )
Change subject: pcu_sock: improve logging
..
pcu_sock: improve logging
In many places we have a pointer to the BTS object, so we can use
LOG_BTS.
Change-Id: I4a3ff23ffccf803b1a97e3f2604d3b422c6d6afd
Related: OS#5198
---
M src/osmo-bsc/pcu_sock.c
1 file changed, 49 insertions(+), 38 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/79/31579/1
diff --git a/src/osmo-bsc/pcu_sock.c b/src/osmo-bsc/pcu_sock.c
index 8286f68..f4e4745 100644
--- a/src/osmo-bsc/pcu_sock.c
+++ b/src/osmo-bsc/pcu_sock.c
@@ -188,7 +188,7 @@
bts_sm = bts->site_mgr;
- LOGP(DPCU, LOGL_INFO, "Sending info for BTS %d\n", bts->nr);
+ LOG_BTS(bts, DPCU, LOGL_INFO, "Sending info for BTS %d\n", bts->nr);
rlcc = >gprs.cell.rlc_cfg;
@@ -414,12 +414,12 @@
/* Bail if no PCU is connected */
if (!pcu_connected(bts)) {
- LOGP(DRSL, LOGL_ERROR, "BTS %d CHAN RQD(GPRS) but PCU not "
+ LOG_BTS(bts, DRSL, LOGL_ERROR, "BTS %d CHAN RQD(GPRS) but PCU
not "
"connected!\n", bts->nr);
return -ENODEV;
}
- LOGP(DPCU, LOGL_INFO, "Sending RACH indication: qta=%d, ra=%d, "
+ LOG_BTS(bts, DPCU, LOGL_INFO, "Sending RACH indication: qta=%d, ra=%d, "
"fn=%d\n", qta, ra, fn);
msg = pcu_msgb_alloc(PCU_IF_MSG_RACH_IND, bts->nr);
@@ -445,7 +445,7 @@
struct gsm_pcu_if *pcu_prim;
struct gsm_pcu_if_data_cnf_dt *data_cnf_dt;
- LOGP(DPCU, LOGL_INFO, "Sending PCH confirm with direct TLLI\n");
+ LOG_BTS(bts, DPCU, LOGL_INFO, "Sending PCH confirm with direct TLLI\n");
msg = pcu_msgb_alloc(PCU_IF_MSG_DATA_CNF_DT, bts->nr);
if (!msg)
@@ -475,14 +475,14 @@
chan_needed = (p1->cneed2 << 2) | p1->cneed1;
rc = osmo_mobile_identity_decode(, p1->data+1, p1->data[0],
false);
if (rc) {
- LOGP(DPCU, LOGL_ERROR, "PCU Sends paging "
-"request type %02x (chan_needed=%02x): Unable to
decode Mobile Identity\n",
+ LOG_BTS(bts, DPCU, LOGL_ERROR, "PCU Sends paging "
+ "request type %02x (chan_needed=%02x): Unable
to decode Mobile Identity\n",
p1->msg_type, chan_needed);
rc = -EINVAL;
break;
}
- LOGP(DPCU, LOGL_ERROR, "PCU Sends paging "
-"request type %02x (chan_needed=%02x, mi=%s)\n",
+ LOG_BTS(bts, DPCU, LOGL_ERROR, "PCU Sends paging "
+ "request type %02x (chan_needed=%02x, mi=%s)\n",
p1->msg_type, chan_needed,
osmo_mobile_identity_to_str_c(OTC_SELECT, ));
/* NOTE: We will have to add 2 to mi_len and subtract 2 from
* the mi pointer because rsl_paging_cmd() will perform the
@@ -494,12 +494,12 @@
break;
case GSM48_MT_RR_PAG_REQ_2:
case GSM48_MT_RR_PAG_REQ_3:
- LOGP(DPCU, LOGL_ERROR, "PCU Sends unsupported paging "
+ LOG_BTS(bts, DPCU, LOGL_ERROR, "PCU Sends unsupported paging "
"request type %02x\n", p1->msg_type);
rc = -EINVAL;
break;
default:
- LOGP(DPCU, LOGL_ERROR, "PCU Sends unknown paging "
+ LOG_BTS(bts, DPCU, LOGL_ERROR, "PCU Sends unknown paging "
"request type %02x\n", p1->msg_type);
rc = -EINVAL;
break;
@@ -523,8 +523,8 @@
pag_grp = gsm0502_calc_paging_group(>si_common.chan_desc,
str_to_imsi(imsi_digit_buf));
- LOGP(DPCU, LOGL_DEBUG, "Calculating paging group: imsi_digit_buf=%s ==>
pag_grp=0x%02x\n",
-imsi_digit_buf, pag_grp);
+ LOG_BTS(bts, DPCU, LOGL_DEBUG, "Calculating paging group:
imsi_digit_buf=%s ==> pag_grp=0x%02x\n",
+ imsi_digit_buf, pag_grp);
return pag_grp;
}
@@ -537,7 +537,7 @@
int rc = 0;
struct gsm_pcu_if_pch_dt *pch_dt;
- LOGP(DPCU, LOGL_DEBUG, "Data request received: sapi=%s arfcn=%d "
+ LOG_BTS(bts, DPCU, LOGL_DEBUG, "Data request received: sapi=%s arfcn=%d
"
"block=%d data=%s\n", sapi_string[data_req->sapi],
data_req->arfcn, data_req->block_nr,
osmo_hexdump(data_req->data, data_req->len));
@@ -567,8 +567,8 @@
* IMMEDIATE ASSIGNMENT towards the PCU using this TLLI as a
reference. */
if (data_req->len < sizeof(struct gsm_pcu_if_pch_dt)) {
- LOGP(DPCU, LOGL_ERROR, "Received PCU data request with
invalid/small length %d\n",
-data_req->len);
+
[M] Change in osmo-bsc[master]: pcu_sock: use struct to transfer IMMEDIATE ASSIGNMENT for PCH
dexter has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-bsc/+/31578 )
Change subject: pcu_sock: use struct to transfer IMMEDIATE ASSIGNMENT for PCH
..
pcu_sock: use struct to transfer IMMEDIATE ASSIGNMENT for PCH
When the IMMEDIATE ASSIGNMENT is sent from the PCU to the BSC using the
"direct TLLI" method, the TLLI (and the paging group) is premended to
the MAC block. Currently we are taking the fields apart manually using
offsets. The code for this is difficult to read and the method is error
prone. Lets define a struct that we can just overlay to access the
fields directly.
Change-Id: Id6acbd243adf26169e5e8319dd66bb68dd6a3c22
Related: OS#5198
---
M include/osmocom/bsc/pcuif_proto.h
M src/osmo-bsc/pcu_sock.c
2 files changed, 39 insertions(+), 11 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/78/31578/1
diff --git a/include/osmocom/bsc/pcuif_proto.h
b/include/osmocom/bsc/pcuif_proto.h
index 7e13b5c..1d12f50 100644
--- a/include/osmocom/bsc/pcuif_proto.h
+++ b/include/osmocom/bsc/pcuif_proto.h
@@ -3,6 +3,7 @@
#include
#include
+#include
#define PCU_SOCK_DEFAULT "/tmp/pcu_bts"
@@ -270,6 +271,17 @@
} cgi_ps;
} __attribute__ ((packed));
+/* Container to send a (confirmed) IMMEDIATE ASSIGNMENT message via PCH. The
struct is send as a data request
+ * (data_req) under SAPI PCU_IF_SAPI_PCH_DT. */
+struct gsm_pcu_if_pch_dt {
+ /* TLLI as reference for confirmation */
+ uint32_t tlli;
+ /* Paging group */
+ uint8_t pgroup[3];
+ /* GSM mac-block (with immediate assignment message) */
+ uint8_t data[GSM_MACBLOCK_LEN];
+} __attribute__((packed));
+
struct gsm_pcu_if {
/* context based information */
uint8_t msg_type; /* message type */
diff --git a/src/osmo-bsc/pcu_sock.c b/src/osmo-bsc/pcu_sock.c
index 0d84781..8286f68 100644
--- a/src/osmo-bsc/pcu_sock.c
+++ b/src/osmo-bsc/pcu_sock.c
@@ -533,9 +533,9 @@
struct gsm_pcu_if_data *data_req)
{
struct msgb *msg;
- uint32_t tlli = -1;
uint8_t pag_grp;
int rc = 0;
+ struct gsm_pcu_if_pch_dt *pch_dt;
LOGP(DPCU, LOGL_DEBUG, "Data request received: sapi=%s arfcn=%d "
"block=%d data=%s\n", sapi_string[data_req->sapi],
@@ -566,34 +566,33 @@
/* DT = direct TLLI. A tlli is prefixed so that the BSC/BTS can
confirm the sending of the downlink
* IMMEDIATE ASSIGNMENT towards the PCU using this TLLI as a
reference. */
- if (data_req->len < 8) {
+ if (data_req->len < sizeof(struct gsm_pcu_if_pch_dt)) {
LOGP(DPCU, LOGL_ERROR, "Received PCU data request with
invalid/small length %d\n",
data_req->len);
break;
}
- /* Extract 4 byte TLLI */
- memcpy(, data_req->data, 4);
+ pch_dt = (struct gsm_pcu_if_pch_dt*)data_req->data;
- /* Extract 3 byte paging group */
- pag_grp = extract_paging_group(bts, data_req->data + 4);
+ pag_grp = extract_paging_group(bts, pch_dt->pgroup);
LOGP(DPCU, LOGL_DEBUG, "PCU Sends immediate assignment via PCH
(tlli=0x%08x, pag_grp=0x%02x)\n",
-tlli, pag_grp);
- msg = msgb_alloc(data_req->len - 7, "pcu_pch");
+pch_dt->tlli, pag_grp);
+ msg = msgb_alloc(sizeof(pch_dt->data), "pcu_pch");
if (!msg) {
rc = -ENOMEM;
break;
}
- msg->l3h = msgb_put(msg, data_req->len - 7);
- memcpy(msg->l3h, data_req->data + 7, data_req->len - 7);
+
+ msg->l3h = msgb_put(msg, sizeof(pch_dt->data));
+ memcpy(msg->l3h, pch_dt->data, sizeof(pch_dt->data));
/* NOTE: Sending an IMMEDIATE ASSIGNMENT via PCH became
necessary with GPRS in order to be able to
* assign downlink TBFs directly through the paging channel.
However, this method never became part
* of the RSL specs. This means that each BTS vendor has to
come up with a proprietary method. At
* the moment we only support Ericsson RBS here. */
if (bts->type == GSM_BTS_TYPE_RBS2000) {
- rc = rsl_ericsson_imm_assign_cmd(bts, tlli, msg->len,
msg->data, pag_grp);
+ rc = rsl_ericsson_imm_assign_cmd(bts, pch_dt->tlli,
msg->len, msg->data, pag_grp);
} else {
LOGP(DPCU, LOGL_ERROR, "BTS model does not support
sending immediate assignment via PCH!\n");
rc = -ENOTSUP;
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/31578
To unsubscribe, or for help writing mail filters, visit
[S] Change in osmo-bsc[master]: pcu_sock: print OML alerts from PCU
Attention is currently required from: pespin, fixeria. dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/31499 ) Change subject: pcu_sock: print OML alerts from PCU .. Patch Set 3: (1 comment) File src/osmo-bsc/pcu_sock.c: https://gerrit.osmocom.org/c/osmo-bsc/+/31499/comment/b8207e19_5e7a32f6 PS2, Line 691: LOGP > Ack Done -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/31499 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Id32553556356c2affe32e47ae1c3ae6a514efdce Gerrit-Change-Number: 31499 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-CC: pespin Gerrit-Attention: pespin Gerrit-Attention: fixeria Gerrit-Comment-Date: Mon, 27 Feb 2023 19:46:25 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Comment-In-Reply-To: fixeria Gerrit-MessageType: comment
[S] Change in osmo-bsc[master]: abis_rsl: assert maximum length
dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/31577 ) Change subject: abis_rsl: assert maximum length .. abis_rsl: assert maximum length The length parameter in rsl_imm_assign_cmd_common() may cause a buffer overflow when it is chosen larger than GSM_MACBLOCK_LEN. This should be asserted. Change-Id: I9417b35fb8c0517f2555e17059bf8ac60fa59791 --- M src/osmo-bsc/abis_rsl.c 1 file changed, 14 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/77/31577/1 diff --git a/src/osmo-bsc/abis_rsl.c b/src/osmo-bsc/abis_rsl.c index ee2e2d3..410f08e 100644 --- a/src/osmo-bsc/abis_rsl.c +++ b/src/osmo-bsc/abis_rsl.c @@ -944,6 +944,7 @@ break; default: /* If phase 2, construct a FULL_IMM_ASS_INFO */ + OSMO_ASSERT(len <= sizeof(buf)); pad_macblock(buf, val, len); msgb_tlv_put(msg, RSL_IE_FULL_IMM_ASS_INFO, GSM_MACBLOCK_LEN, buf); -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/31577 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I9417b35fb8c0517f2555e17059bf8ac60fa59791 Gerrit-Change-Number: 31577 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-MessageType: newchange
[S] Change in osmo-bsc[master]: pcu_sock: print OML alerts from PCU
Attention is currently required from: pespin, fixeria. Hello Jenkins Builder, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/31499 to look at the new patch set (#3). Change subject: pcu_sock: print OML alerts from PCU .. pcu_sock: print OML alerts from PCU The PCU is able to send OML alerts via the BTS to the BSC. When the PCU operates in co-location to the BSC we just print the alerts in the log directly Change-Id: Id32553556356c2affe32e47ae1c3ae6a514efdce Related: OS#5198 --- M src/osmo-bsc/pcu_sock.c 1 file changed, 17 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/99/31499/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/31499 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Id32553556356c2affe32e47ae1c3ae6a514efdce Gerrit-Change-Number: 31499 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-CC: pespin Gerrit-Attention: pespin Gerrit-Attention: fixeria Gerrit-MessageType: newpatchset
[M] Change in osmo-bsc[master]: pcu_sock: activate/deactivate PDCH on pcu reconnect
Attention is currently required from: neels, fixeria. Hello Jenkins Builder, neels, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/31497 to look at the new patch set (#3). Change subject: pcu_sock: activate/deactivate PDCH on pcu reconnect .. pcu_sock: activate/deactivate PDCH on pcu reconnect When the PCU is disconnected while the BSC keeps running the PDCH should be closed. Also the PDCH should be reopened when the PCU is reconnected. Change-Id: I9ea0c53a5e68a51c781ef43bae71f947cdb95678 Related: OS#5198 --- M doc/timeslot.msc M include/osmocom/bsc/timeslot_fsm.h M src/osmo-bsc/pcu_sock.c M src/osmo-bsc/timeslot_fsm.c 4 files changed, 112 insertions(+), 18 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/97/31497/3 -- 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: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-CC: fixeria Gerrit-Attention: neels Gerrit-Attention: fixeria Gerrit-MessageType: newpatchset
[M] Change in osmo-bsc[master]: pcu_sock: activate/deactivate PDCH on pcu reconnect
Attention is currently required from: neels, fixeria. dexter 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 3: (9 comments) Commit Message: https://gerrit.osmocom.org/c/osmo-bsc/+/31497/comment/a0d8dcdf_350f924a PS2, Line 10: po > typo Done File doc/timeslot.msc: https://gerrit.osmocom.org/c/osmo-bsc/+/31497/comment/692f83cc_73d3c2ba PS2, Line 95: bsc_ts abox bsc_ts [label="UNUSED"]; > a timeslot FSM cannot transition from ST_PDCH directly to ST_UNUSED. […] Thats true, Can we shorten this since the mechanism is already explained above. I have now added some dots in the graph to indicate that there is something in between. https://gerrit.osmocom.org/c/osmo-bsc/+/31497/comment/872f8b9d_933f3141 PS2, Line 98: " > \nfor all timeslots in state UNUSED:" Done https://gerrit.osmocom.org/c/osmo-bsc/+/31497/comment/61358273_1c43b7c9 PS2, Line 99: PDCH > UNUSED Done https://gerrit.osmocom.org/c/osmo-bsc/+/31497/comment/5f4e20a2_893985a0 PS2, Line 100: bsc_ts <- pcu_sock [label="TS_EV_PDCH_ACT"]; > bsc_ts abox bsc_ts [label="WAIT_PDCH_ACT (4s, T23001)"]; […] (see above: this can't be shortened.) File include/osmocom/bsc/timeslot_fsm.h: https://gerrit.osmocom.org/c/osmo-bsc/+/31497/comment/c1b8d803_179120eb PS2, Line 38: TS_EV_LCHAN_UNUSED, > Would be nice to add comments to clarify how the "TS_EV_PDCH_*" are > fundamentally different: […] Done https://gerrit.osmocom.org/c/osmo-bsc/+/31497/comment/2230b651_6106dd49 PS2, Line 42: TS_EV_PDCH_DEACT_NACK, > /* An Ericsson PCU has disconnected from OsmoBSC, deactivate PDCH: */ Done https://gerrit.osmocom.org/c/osmo-bsc/+/31497/comment/8bf192c0_9df3612f PS2, Line 43: TS_EV_PDCH_DEACT, > /* An Ericsson PCU has reconnected to OsmoBSC, re-activate PDCH: */ Done File src/osmo-bsc/pcu_sock.c: https://gerrit.osmocom.org/c/osmo-bsc/+/31497/comment/c5e97d03_1deb1545 PS2, Line 940: /* FIXME: allow multiple BTS */ > i understand now, so far the entire pcu_sock. […] That is correct. Thats also a limitation of the the PCU itsself. At some day we will have to resolve that but for the moment I think that no one will run an osmo-bsc setup with multiple ericsson BTS attached. Since the BTS is hooked up via an E1 line each site will likely get its own BSC on site, so I think there is no immediate pressure to fix this. -- 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: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-CC: fixeria Gerrit-Attention: neels Gerrit-Attention: fixeria Gerrit-Comment-Date: Mon, 27 Feb 2023 19:46:25 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: neels Gerrit-MessageType: comment
[S] Change in osmo-bsc[master]: timeslot_fsm: fix sourcecode indenting
Attention is currently required from: neels, dexter. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/31498 ) Change subject: timeslot_fsm: fix sourcecode indenting .. Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/31498 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I1cfd377cd8014e42aa45f9f0da664598ee88e02d Gerrit-Change-Number: 31498 Gerrit-PatchSet: 4 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: neels Gerrit-Attention: neels Gerrit-Attention: dexter Gerrit-Comment-Date: Mon, 27 Feb 2023 19:25:38 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-bsc[master]: timeslot_fsm: fix sourcecode indenting
Attention is currently required from: neels. Hello Jenkins Builder, neels, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/31498 to look at the new patch set (#4). Change subject: timeslot_fsm: fix sourcecode indenting .. timeslot_fsm: fix sourcecode indenting Change-Id: I1cfd377cd8014e42aa45f9f0da664598ee88e02d --- M include/osmocom/bsc/timeslot_fsm.h 1 file changed, 12 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/98/31498/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/31498 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I1cfd377cd8014e42aa45f9f0da664598ee88e02d Gerrit-Change-Number: 31498 Gerrit-PatchSet: 4 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: neels Gerrit-Attention: neels Gerrit-MessageType: newpatchset
[S] Change in osmo-bsc[master]: timeslot_fsm: fix sourcecode indenting
Attention is currently required from: neels. dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/31498 ) Change subject: timeslot_fsm: fix sourcecode indenting .. Patch Set 4: (1 comment) Commit Message: https://gerrit.osmocom.org/c/osmo-bsc/+/31498/comment/8929bac8_da21ad24 PS2, Line 7: sourcecode formatting > indenting =) Done -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/31498 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I1cfd377cd8014e42aa45f9f0da664598ee88e02d Gerrit-Change-Number: 31498 Gerrit-PatchSet: 4 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: neels Gerrit-Attention: neels Gerrit-Comment-Date: Mon, 27 Feb 2023 19:25:11 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: neels Gerrit-MessageType: comment
[S] Change in osmo-bsc[master]: timeslot_fsm: fix sourcecode formatting
Attention is currently required from: dexter. Hello Jenkins Builder, neels, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/31498 to look at the new patch set (#3). Change subject: timeslot_fsm: fix sourcecode formatting .. timeslot_fsm: fix sourcecode formatting Change-Id: I1cfd377cd8014e42aa45f9f0da664598ee88e02d --- M include/osmocom/bsc/timeslot_fsm.h 1 file changed, 12 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/98/31498/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/31498 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I1cfd377cd8014e42aa45f9f0da664598ee88e02d Gerrit-Change-Number: 31498 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: neels Gerrit-Attention: dexter Gerrit-MessageType: newpatchset
[S] Change in osmo-bsc[master]: Cosmetic: codec_pref: tweak comments
Attention is currently required from: osmith, neels. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/31540 ) Change subject: Cosmetic: codec_pref: tweak comments .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/31540 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I30f0744db9aebf2f05077fef840097c332b9dafd Gerrit-Change-Number: 31540 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Attention: osmith Gerrit-Attention: neels Gerrit-Comment-Date: Mon, 27 Feb 2023 19:22:52 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in osmo-ttcn3-hacks[master]: TC_assignment_csd: expect BSC to handle CSD
Attention is currently required from: osmith. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/31557 ) Change subject: TC_assignment_csd: expect BSC to handle CSD .. Patch Set 2: Code-Review+1 (1 comment) File bsc/BSC_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/31557/comment/5deaa0d3_4301ff26 PS2, Line 1844: octetstring `OCT1`? -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/31557 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Iff19dc704af09d09d2265d8da38fc745a3936ce4 Gerrit-Change-Number: 31557 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Attention: osmith Gerrit-Comment-Date: Mon, 27 Feb 2023 19:10:53 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in osmo-ttcn3-hacks[master]: library/RSL_Types: RSL_SpeechAlgo: support CSD
Attention is currently required from: osmith, laforge. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/31556 ) Change subject: library/RSL_Types: RSL_SpeechAlgo: support CSD .. Patch Set 2: (1 comment) File library/RSL_Types.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/31556/comment/40f271a0_d49c8aac PS2, Line 389: RSL_SpeechAlgoDataRate I am currently looking at 3GPP TS 48.058 section 9.3.6, and I see the following: If octet 4 indicates speech, then octet 6 is coded as follows: 0001 - GSM speech coding algorithm version 1 ... 1101 - GSM speech coding algorithm version 6 All other values are reserved. Then below I see: If octet 4 indicates data, then octet 6 is coded as follows: So the encoding of octet 6 depends on the value of octet 4. The octet 6 itself is defined as follows: Speech coding algor./data rate + transp ind AFAIU, the '/' means either speech or data. I don't think mixing up all encoding variants in one enumerated type is a good idea. I would rather have several enums grouped into a union. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/31556 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ief2d95c7e9d71afb26fa74da755294226c8e158d Gerrit-Change-Number: 31556 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-Attention: osmith Gerrit-Attention: laforge Gerrit-Comment-Date: Mon, 27 Feb 2023 18:43:03 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
[S] Change in osmo-bsc[master]: Cosmetic: fix various typos
Attention is currently required from: osmith. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/31539 ) Change subject: Cosmetic: fix various typos .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/31539 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I9225e733e3afa8171f24253e21eaffc654f689af Gerrit-Change-Number: 31539 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Attention: osmith Gerrit-Comment-Date: Mon, 27 Feb 2023 18:16:54 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in libosmo-gprs[master]: rlcmac: dl_tbf: Improve logic requesting a new UL TBF
pespin has uploaded this change for review. (
https://gerrit.osmocom.org/c/libosmo-gprs/+/31576 )
Change subject: rlcmac: dl_tbf: Improve logic requesting a new UL TBF
..
rlcmac: dl_tbf: Improve logic requesting a new UL TBF
Change-Id: I702872ba32a410bb5f09943af3cdadca482562db
---
M include/osmocom/gprs/rlcmac/gre.h
M src/rlcmac/gre.c
M src/rlcmac/rlcmac_enc.c
M src/rlcmac/tbf_ul.c
M tests/rlcmac/rlcmac_prim_test.c
M tests/rlcmac/rlcmac_prim_test.err
M tests/rlcmac/rlcmac_prim_test.ok
7 files changed, 147 insertions(+), 4 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/libosmo-gprs refs/changes/76/31576/1
diff --git a/include/osmocom/gprs/rlcmac/gre.h
b/include/osmocom/gprs/rlcmac/gre.h
index ca5f773..f6397a6 100644
--- a/include/osmocom/gprs/rlcmac/gre.h
+++ b/include/osmocom/gprs/rlcmac/gre.h
@@ -20,6 +20,10 @@
struct gprs_rlcmac_entity *gprs_rlcmac_entity_alloc(uint32_t tlli);
void gprs_rlcmac_entity_free(struct gprs_rlcmac_entity *gre);
+bool gprs_rlcmac_entity_in_packet_idle_mode(const struct gprs_rlcmac_entity
*gre);
+bool gprs_rlcmac_entity_in_packet_transfer_mode(const struct
gprs_rlcmac_entity *gre);
+bool gprs_rlcmac_entity_have_tx_data_queued(const struct gprs_rlcmac_entity
*gre);
+
int gprs_rlcmac_entity_llc_enqueue(struct gprs_rlcmac_entity *gre, uint8_t
*ll_pdu, unsigned int ll_pdu_len,
enum osmo_gprs_rlcmac_llc_sapi sapi, uint8_t
radio_prio);
diff --git a/src/rlcmac/gre.c b/src/rlcmac/gre.c
index 40cd585..53d53c7 100644
--- a/src/rlcmac/gre.c
+++ b/src/rlcmac/gre.c
@@ -66,6 +66,40 @@
talloc_free(gre);
}
+/* TS 44.060 5.3 In packet idle mode:
+* - no temporary block flow (TBF) exists..
+* - the mobile station monitors the relevant paging subchannels on CCCH. In
packet
+* idle mode, upper layers may require the transfer of a upper layer PDU, which
+* implicitly triggers the establishment of a TBF and the transition to packet
+* transfer mode. In packet idle mode, upper layers may require the
establishment
+* of an RR connection. When the mobile station enters dedicated mode (see 3GPP
TS
+* 44.018), it may leave the packet idle mode, if the mobile station limitations
+* make it unable to handle the RR connection and the procedures in packet idle
+* mode simultaneously.*/
+bool gprs_rlcmac_entity_in_packet_idle_mode(const struct gprs_rlcmac_entity
*gre)
+{
+ return !gre->ul_tbf && !gre->dl_tbf;
+}
+
+/* TS 44.060 5.4 "In packet transfer mode, the mobile station is allocated
radio
+* resources providing one or more TBFs. [...]
+* When a transfer of upper layer PDUs
+* terminates, in either downlink or uplink direction, the corresponding TBF is
+* released. In packet transfer mode, when all TBFs have been released, in
downlink
+* and uplink direction, the mobile station returns to packet idle mode."
+*/
+bool gprs_rlcmac_entity_in_packet_transfer_mode(const struct
gprs_rlcmac_entity *gre)
+{
+ return gre->ul_tbf || gre->dl_tbf;
+}
+
+/* Whether MS has data queued from upper layers waiting to be transmitted in
the
+ * Tx queue (an active UL TBF may still have some extra data) */
+bool gprs_rlcmac_entity_have_tx_data_queued(const struct gprs_rlcmac_entity
*gre)
+{
+ return gprs_rlcmac_llc_queue_size(gre->llc_queue) > 0;
+}
+
int gprs_rlcmac_entity_llc_enqueue(struct gprs_rlcmac_entity *gre, uint8_t
*ll_pdu, unsigned int ll_pdu_len,
enum osmo_gprs_rlcmac_llc_sapi sapi, uint8_t
radio_prio)
{
@@ -75,7 +109,11 @@
if (rc < 0)
return rc;
- if (!gre->ul_tbf) {
+ /* TS 44.060 5.3 "In packet idle mode, upper layers may require the
+ * transfer of a upper layer PDU, which implicitly triggers the
+ * establishment of a TBF and the transition to packet transfer mode." */
+ if (gprs_rlcmac_entity_in_packet_idle_mode(gre)) {
+ OSMO_ASSERT(!gre->ul_tbf);
/* We have new data in the queue but we have no ul_tbf.
Allocate one and start UL Assignment. */
gre->ul_tbf = gprs_rlcmac_ul_tbf_alloc(gre);
if (!gre->ul_tbf)
diff --git a/src/rlcmac/rlcmac_enc.c b/src/rlcmac/rlcmac_enc.c
index 6bceb8d..94f85f2 100644
--- a/src/rlcmac/rlcmac_enc.c
+++ b/src/rlcmac/rlcmac_enc.c
@@ -395,8 +395,9 @@
ack->DOWNLINK_TFI = dl_tbf->cur_alloc.dl_tfi;
gprs_rlcmac_enc_prepare_pkt_ack_nack_desc_gprs(>Ack_Nack_Description,
dl_tbf);
- /* Channel Request Description */
- if (gre->ul_tbf && gprs_rlcmac_tbf_ul_ass_pending(gre->ul_tbf)) {
+ /* Channel Request Description. Request a UL-TBF if we have UL data
+* queued to send and no active UL BF (TS 44.060 8.1.2.5) */
+ if (!gre->ul_tbf && gprs_rlcmac_entity_have_tx_data_queued(gre)) {
Channel_Request_Description_t *chan_req =
>Channel_Request_Description;
ack->Exist_Channel_Request_Description =
[M] Change in osmocom-bb[master]: modem: route L1CTL prims to/from libosmo-gprs-rlcmac
Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/31572 ) Change subject: modem: route L1CTL prims to/from libosmo-gprs-rlcmac .. Patch Set 1: (1 comment) File src/host/layer23/src/modem/rlcmac.c: https://gerrit.osmocom.org/c/osmocom-bb/+/31572/comment/f5cab026_e6d0747c PS1, Line 173: rlcmac_prim_l1ctl_alloc > Nothing really prevents you from filling the struct with a designated > initializer like you are doing […] ... the need to pass dummy arguments to `osmo_gprs_rlcmac_prim_alloc_l1ctl_pdch_data_ind()` which will then be overwritten by designated initializer. I can go for that, but I really like this approach. -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/31572 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I38e9a686f8edc3fe55f961d75e68602c33bbbaaf Gerrit-Change-Number: 31572 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Attention: pespin Gerrit-Comment-Date: Mon, 27 Feb 2023 17:27:13 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Comment-In-Reply-To: fixeria Gerrit-MessageType: comment
[M] Change in osmo-ttcn3-hacks[master]: TC_assignment_csd: expect BSC to handle CSD
Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/31557 ) Change subject: TC_assignment_csd: expect BSC to handle CSD .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/31557 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Iff19dc704af09d09d2265d8da38fc745a3936ce4 Gerrit-Change-Number: 31557 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Attention: osmith Gerrit-Comment-Date: Mon, 27 Feb 2023 17:24:54 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-bsc[master]: Cosmetic: channel_mode_from_lchan: remove fixme
Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/31555 ) Change subject: Cosmetic: channel_mode_from_lchan: remove fixme .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/31555 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ic074cb814662d73f52d4401d1cf9cdbf682040a9 Gerrit-Change-Number: 31555 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Attention: osmith Gerrit-Comment-Date: Mon, 27 Feb 2023 17:24:27 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-bsc[master]: chan_mode_to_mgcp_codec: support CSD
Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/31554 ) Change subject: chan_mode_to_mgcp_codec: support CSD .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/31554 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ib5876ee4dac9e8000cc3ae0c5dd87aae3d723829 Gerrit-Change-Number: 31554 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Attention: osmith Gerrit-Comment-Date: Mon, 27 Feb 2023 17:24:05 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in osmocom-bb[master]: modem: route L1CTL prims to/from libosmo-gprs-rlcmac
Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/31572 ) Change subject: modem: route L1CTL prims to/from libosmo-gprs-rlcmac .. Patch Set 1: (1 comment) File src/host/layer23/src/modem/rlcmac.c: https://gerrit.osmocom.org/c/osmocom-bb/+/31572/comment/eec15140_d6e25384 PS1, Line 173: rlcmac_prim_l1ctl_alloc > > I see no real need to expose it […] Nothing really prevents you from filling the struct with a designated initializer like you are doing here after using the existing API. I'm no against exposing the other API but I really see why is this really blocking your here now. -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/31572 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I38e9a686f8edc3fe55f961d75e68602c33bbbaaf Gerrit-Change-Number: 31572 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Attention: fixeria Gerrit-Comment-Date: Mon, 27 Feb 2023 17:23:04 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Comment-In-Reply-To: pespin Gerrit-MessageType: comment
[S] Change in osmo-hnbgw[master]: log osmo_fsm timeouts
neels has submitted this change. (
https://gerrit.osmocom.org/c/osmo-hnbgw/+/31433 )
(
5 is the latest approved patch-set.
No files were changed between the latest approved patch-set and the submitted
one.
)Change subject: log osmo_fsm timeouts
..
log osmo_fsm timeouts
set osmo_fsm_log_timeouts(true);
Change-Id: Ic1ca03f06fbdef5a3fbe503e4414a780eb3e0fcc
---
M src/osmo-hnbgw/hnbgw.c
1 file changed, 13 insertions(+), 0 deletions(-)
Approvals:
msuraev: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/src/osmo-hnbgw/hnbgw.c b/src/osmo-hnbgw/hnbgw.c
index ce82282..5b4e9b6 100644
--- a/src/osmo-hnbgw/hnbgw.c
+++ b/src/osmo-hnbgw/hnbgw.c
@@ -735,6 +735,8 @@
if (rc < 0)
exit(1);
+ osmo_fsm_log_timeouts(true);
+
rc = osmo_ss7_init();
if (rc < 0) {
LOGP(DMAIN, LOGL_FATAL, "osmo_ss7_init() failed with rc=%d\n",
rc);
--
To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/31433
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-hnbgw
Gerrit-Branch: master
Gerrit-Change-Id: Ic1ca03f06fbdef5a3fbe503e4414a780eb3e0fcc
Gerrit-Change-Number: 31433
Gerrit-PatchSet: 6
Gerrit-Owner: neels
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge
Gerrit-Reviewer: msuraev
Gerrit-Reviewer: neels
Gerrit-MessageType: merged
[S] Change in osmo-hnbgw[master]: sccp_sap_up(): ignore PCSTATE.ind
neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/31429 ) Change subject: sccp_sap_up(): ignore PCSTATE.ind .. sccp_sap_up(): ignore PCSTATE.ind Silence the error log about "unknown" PCSTATE prim. Todo / coming up: instead of ignoring, detect a Destination Unavailable from prim->u.pcstate and disconnect all conns with that particular CN link. Depends: libosmo-sccp If381f537ab91af1feef7f0e51921217f27e18e6a Change-Id: I547387a5cc14ccb506be04ac785e6807fc4e6a96 --- M TODO-RELEASE M src/osmo-hnbgw/hnbgw_cn.c 2 files changed, 21 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/TODO-RELEASE b/TODO-RELEASE index 84cc2ea..cec63db 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -9,3 +9,4 @@ #library whatdescription / commit summary line osmo-hnbgw cfg config deprecated: 'sccp cr max-payload-len <0-99>' libosmo-sigtran>=1.7.0 Ensure SCCP CR max payload length of 130 bytes is enforced. + Uses osmo_scu_prim_hdr_name_c() diff --git a/src/osmo-hnbgw/hnbgw_cn.c b/src/osmo-hnbgw/hnbgw_cn.c index 731c758..856bf79 100644 --- a/src/osmo-hnbgw/hnbgw_cn.c +++ b/src/osmo-hnbgw/hnbgw_cn.c @@ -430,6 +430,10 @@ case OSMO_PRIM(OSMO_SCU_PRIM_N_DISCONNECT, PRIM_OP_INDICATION): rc = handle_cn_disc_ind(cnlink, >u.disconnect, oph); break; + case OSMO_PRIM(OSMO_SCU_PRIM_N_PCSTATE, PRIM_OP_INDICATION): + LOGP(DMAIN, LOGL_DEBUG, "Ignoring prim %s from SCCP USER SAP\n", +osmo_scu_prim_hdr_name_c(OTC_SELECT, oph)); + break; default: LOGP(DMAIN, LOGL_ERROR, "Received unknown prim %u from SCCP USER SAP\n", -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/31429 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I547387a5cc14ccb506be04ac785e6807fc4e6a96 Gerrit-Change-Number: 31429 Gerrit-PatchSet: 7 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: merged
[S] Change in osmo-bsc[master]: Cosmetic: fix various typos
Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/31539 ) Change subject: Cosmetic: fix various typos .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/31539 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I9225e733e3afa8171f24253e21eaffc654f689af Gerrit-Change-Number: 31539 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Attention: osmith Gerrit-Comment-Date: Mon, 27 Feb 2023 17:17:23 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-bsc[master]: Cosmetic: codec_pref: tweak comments
Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/31540 ) Change subject: Cosmetic: codec_pref: tweak comments .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/31540 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I30f0744db9aebf2f05077fef840097c332b9dafd Gerrit-Change-Number: 31540 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Attention: osmith Gerrit-Comment-Date: Mon, 27 Feb 2023 17:16:55 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-bsc[master]: channel_mode_from_lchan: add GSM48_CMODE_DATA_3k6
Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/31546 ) Change subject: channel_mode_from_lchan: add GSM48_CMODE_DATA_3k6 .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/31546 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Id9ec34f77c96d3a209c6f78d2addf1ea0dfa228d Gerrit-Change-Number: 31546 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Attention: osmith Gerrit-Comment-Date: Mon, 27 Feb 2023 17:16:31 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-bsc[master]: bssmap_handle_ass_req_tp_codec_list: tweak log msg
Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/31550 ) Change subject: bssmap_handle_ass_req_tp_codec_list: tweak log msg .. Patch Set 1: (1 comment) Commit Message: https://gerrit.osmocom.org/c/osmo-bsc/+/31550/comment/005fd846_82b7e708 PS1, Line 9: Remove "speech mode" from the log message, as it is relevant for CSD as it is not relevant? -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/31550 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Idfab0b7f6e97a6b67d140f967ddfe9b29818586e Gerrit-Change-Number: 31550 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-Attention: osmith Gerrit-Comment-Date: Mon, 27 Feb 2023 17:16:15 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
[M] Change in osmocom-bb[master]: modem: route L1CTL prims to/from libosmo-gprs-rlcmac
Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/31572 ) Change subject: modem: route L1CTL prims to/from libosmo-gprs-rlcmac .. Patch Set 1: (1 comment) File src/host/layer23/src/modem/rlcmac.c: https://gerrit.osmocom.org/c/osmocom-bb/+/31572/comment/95f1298e_5086dbe9 PS1, Line 173: rlcmac_prim_l1ctl_alloc > I see no real need to expose it Somehow I expected this answer :/ Sad. > you can simply use the existing API and still fill it afterwards I want to fill it once in one place. And I like using designated initializer for that. > Some of those alloc APIs doesn't really even let you set all the params This is another argument to expose the alloc API: limitations of your template functions. -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/31572 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I38e9a686f8edc3fe55f961d75e68602c33bbbaaf Gerrit-Change-Number: 31572 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Attention: pespin Gerrit-Comment-Date: Mon, 27 Feb 2023 17:15:38 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Comment-In-Reply-To: fixeria Gerrit-MessageType: comment
[S] Change in osmo-bsc[master]: abis_rsl: ipacc_payload_type: handle CSD
Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/31548 ) Change subject: abis_rsl: ipacc_payload_type: handle CSD .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/31548 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ie561d87ecdc161b9a69eb7683889f0395524faa8 Gerrit-Change-Number: 31548 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Attention: osmith Gerrit-Comment-Date: Mon, 27 Feb 2023 17:14:54 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in osmo-bsc[master]: rsl_tx_ipacc_crcx/mdcx: omit speech mode for CSD
Attention is currently required from: osmith.
pespin has posted comments on this change. (
https://gerrit.osmocom.org/c/osmo-bsc/+/31549 )
Change subject: rsl_tx_ipacc_crcx/mdcx: omit speech mode for CSD
..
Patch Set 1:
(1 comment)
File src/osmo-bsc/abis_rsl.c:
https://gerrit.osmocom.org/c/osmo-bsc/+/31549/comment/27e67f91_3ac1fbaa
PS1, Line 2747: if (lchan->abis_ip.rtp_payload == RTP_PT_CSDATA)
match {} with else below.
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/31549
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: I6641b713177276bcf798f08123e1dd2e88ffdce6
Gerrit-Change-Number: 31549
Gerrit-PatchSet: 1
Gerrit-Owner: osmith
Gerrit-Reviewer: Jenkins Builder
Gerrit-CC: pespin
Gerrit-Attention: osmith
Gerrit-Comment-Date: Mon, 27 Feb 2023 17:14:27 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment
[M] Change in osmo-bsc[master]: requires_voice_stream -> requires_rtp_stream
Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/31553 ) Change subject: requires_voice_stream -> requires_rtp_stream .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/31553 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I832ca268f5703fd35781d1fdf4f1e669b3d0ef9b Gerrit-Change-Number: 31553 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Attention: osmith Gerrit-Comment-Date: Mon, 27 Feb 2023 17:12:53 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in osmo-bsc[master]: lchan.h: remove enum lchan_csd_mode
Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/31545 ) Change subject: lchan.h: remove enum lchan_csd_mode .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/31545 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ice914744da3a2084e82d125848fb69404b8e8a36 Gerrit-Change-Number: 31545 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Attention: osmith Gerrit-Comment-Date: Mon, 27 Feb 2023 17:11:01 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-ggsn[rel-1.10.1]: lib/icmpv6.h: fix struct icmpv6_{radv_hdr,opt_prefix}
fixeria has abandoned this change. (
https://gerrit.osmocom.org/c/osmo-ggsn/+/31559 )
Change subject: lib/icmpv6.h: fix struct icmpv6_{radv_hdr,opt_prefix}
..
Abandoned
Tagged current master instead.
--
To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/31559
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ggsn
Gerrit-Branch: rel-1.10.1
Gerrit-Change-Id: Ifaa63bb5496e056805bd13b964c8b430fb11c24c
Gerrit-Change-Number: 31559
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria
Gerrit-Reviewer: Jenkins Builder
Gerrit-MessageType: abandon
[M] Change in osmo-bsc[master]: codec_pref: split test_codec_support_bts_rate
Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/31544 ) Change subject: codec_pref: split test_codec_support_bts_rate .. Patch Set 1: (1 comment) File src/osmo-bsc/codec_pref.c: https://gerrit.osmocom.org/c/osmo-bsc/+/31544/comment/7d7596b4_cb1af3b7 PS1, Line 211: if (rc < 0 || !test_codec_support_bts_rate(bts, full_rate)) this looks a bit weird/condensed, you could split it into 2 ifs like it was before. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/31544 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Iea8a23ef3c66ed556110038fe9f3bc7f6eef3e96 Gerrit-Change-Number: 31544 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-Attention: osmith Gerrit-Comment-Date: Mon, 27 Feb 2023 17:05:05 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
[M] Change in osmo-bsc[master]: bssmap_handle_ass_req_ct_speech: split up
Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/31542 ) Change subject: bssmap_handle_ass_req_ct_speech: split up .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/31542 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I4d9a4df314b1e56b9c1f90c9d7914332b70b56f8 Gerrit-Change-Number: 31542 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Attention: osmith Gerrit-Comment-Date: Mon, 27 Feb 2023 17:02:12 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in osmo-bsc[master]: bssmap_handle_ass_req_ct_speech: refactor
Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/31543 ) Change subject: bssmap_handle_ass_req_ct_speech: refactor .. Patch Set 1: (1 comment) File src/osmo-bsc/osmo_bsc_bssap.c: https://gerrit.osmocom.org/c/osmo-bsc/+/31543/comment/ee0c5dde_d1d510da PS1, Line 994: struct assignment_request req; change looks non related? -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/31543 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I6bb16b26d89056dffa50bd8296fefe9315c587ca Gerrit-Change-Number: 31543 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-Attention: osmith Gerrit-Comment-Date: Mon, 27 Feb 2023 17:00:22 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
[M] Change in osmo-bsc[master]: bssmap_handle_ass_req_ct_data: implement
Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/31547 ) Change subject: bssmap_handle_ass_req_ct_data: implement .. Patch Set 1: (1 comment) File include/osmocom/bsc/codec_pref.h: https://gerrit.osmocom.org/c/osmo-bsc/+/31547/comment/2371e5e3_3a7ca2c7 PS1, Line 22: const bool full_rate); I wonder why is enum rate_pref rate_pref not used here. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/31547 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I350bea15fd2158eb6edc9bc92f2dca48930736e9 Gerrit-Change-Number: 31547 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-Attention: osmith Gerrit-Comment-Date: Mon, 27 Feb 2023 16:58:13 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
[S] Change in osmo-bsc[master]: lchan_select: chan_mode_to_chan_type: support CSD
Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/31552 ) Change subject: lchan_select: chan_mode_to_chan_type: support CSD .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/31552 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I6b02d7edbf268a7f07134b54a7289529b2485122 Gerrit-Change-Number: 31552 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Attention: osmith Gerrit-Comment-Date: Mon, 27 Feb 2023 16:54:24 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in osmo-bsc[master]: assignment_fsm: chan mode check: support CSD
Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/31551 ) Change subject: assignment_fsm: chan mode check: support CSD .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/31551 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Iee5cbfee84d7f2ad59ee2d5a19891a2b59bbafff Gerrit-Change-Number: 31551 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Attention: osmith Gerrit-Comment-Date: Mon, 27 Feb 2023 16:53:30 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[L] Change in osmo-bsc[master]: bssmap_handle_assignm_req: split up
Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/31541 ) Change subject: bssmap_handle_assignm_req: split up .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/31541 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I8580e75e292cff1b52b6ba1bafd12c155c3bbe93 Gerrit-Change-Number: 31541 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Attention: osmith Gerrit-Comment-Date: Mon, 27 Feb 2023 16:50:12 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-pcu[master]: pcu_l1_if_phy: add new PHY API function to initialize PHY
Attention is currently required from: fixeria, dexter. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/31574 ) Change subject: pcu_l1_if_phy: add new PHY API function to initialize PHY .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/31574 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ibf2a3a058c826f6ee5b740eee72d5be94d460517 Gerrit-Change-Number: 31574 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Attention: fixeria Gerrit-Attention: dexter Gerrit-Comment-Date: Mon, 27 Feb 2023 16:48:27 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in osmocom-bb[master]: modem: route L1CTL prims to/from libosmo-gprs-rlcmac
Attention is currently required from: fixeria.
pespin has posted comments on this change. (
https://gerrit.osmocom.org/c/osmocom-bb/+/31572 )
Change subject: modem: route L1CTL prims to/from libosmo-gprs-rlcmac
..
Patch Set 1:
(1 comment)
File src/host/layer23/src/modem/rlcmac.c:
https://gerrit.osmocom.org/c/osmocom-bb/+/31572/comment/480729a8_eb12055e
PS1, Line 173: rlcmac_prim_l1ctl_alloc
> > ... which alone takes almost the entire line on my screen […]
I see no real need to expose it, you can simply use the existing API and still
fill it afterwards as you please. Some of those alloc APIs doesn't really even
let you set all the params, just a few most relevant ones.
Passing multiple arguments: use multiple lines.
rlcmac_prim = osmo_gprs_rlcmac_prim_alloc_l1ctl_pdch_data_ind({1,2,3,...});
rlcmac_prim->l1ctl =
--
To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/31572
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmocom-bb
Gerrit-Branch: master
Gerrit-Change-Id: I38e9a686f8edc3fe55f961d75e68602c33bbbaaf
Gerrit-Change-Number: 31572
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pespin
Gerrit-Attention: fixeria
Gerrit-Comment-Date: Mon, 27 Feb 2023 16:47:19 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: fixeria
Gerrit-MessageType: comment
[S] Change in osmo-pcu[master]: pcu_l1_if_phy: add header file for struct gsmtap_inst
Attention is currently required from: pespin, fixeria. dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/31558 ) Change subject: pcu_l1_if_phy: add header file for struct gsmtap_inst .. Patch Set 2: (1 comment) File src/pcu_l1_if_phy.h: https://gerrit.osmocom.org/c/osmo-pcu/+/31558/comment/839c0ed5_7f6728b7 PS2, Line 4: #include > I find it more correct to add the header here since this declaration is > provided by some external de […] Ack -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/31558 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I9b859c4f7906f31547549d4ff7751fb720519270 Gerrit-Change-Number: 31558 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Attention: pespin Gerrit-Attention: fixeria Gerrit-Comment-Date: Mon, 27 Feb 2023 16:44:59 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Comment-In-Reply-To: fixeria Gerrit-MessageType: comment
[M] Change in osmo-pcu[master]: pcu_l1_if_phy: add new PHY API function to disconnect PDCH
Attention is currently required from: pespin, fixeria, dexter. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/31573 ) Change subject: pcu_l1_if_phy: add new PHY API function to disconnect PDCH .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/31573 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ied88f3289bda87c48f5f9255c4591470633cc805 Gerrit-Change-Number: 31573 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Attention: pespin Gerrit-Attention: fixeria Gerrit-Attention: dexter Gerrit-Comment-Date: Mon, 27 Feb 2023 16:43:30 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in osmo-ttcn3-hacks[master]: library/RSL_Types: RSL_SpeechAlgo: support CSD
Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/31556 ) Change subject: library/RSL_Types: RSL_SpeechAlgo: support CSD .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/31556 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ief2d95c7e9d71afb26fa74da755294226c8e158d Gerrit-Change-Number: 31556 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Attention: osmith Gerrit-Comment-Date: Mon, 27 Feb 2023 16:34:01 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-pcu[master]: pcu_l1_if_phy: add header file for struct gsmtap_inst
Attention is currently required from: fixeria, dexter. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/31558 ) Change subject: pcu_l1_if_phy: add header file for struct gsmtap_inst .. Patch Set 2: Code-Review+1 (1 comment) File src/pcu_l1_if_phy.h: https://gerrit.osmocom.org/c/osmo-pcu/+/31558/comment/aec2dbea_a9ee014c PS2, Line 4: #include > It would be enough to add a forward declaration. I find it more correct to add the header here since this declaration is provided by some external dependency. -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/31558 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I9b859c4f7906f31547549d4ff7751fb720519270 Gerrit-Change-Number: 31558 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Attention: fixeria Gerrit-Attention: dexter Gerrit-Comment-Date: Mon, 27 Feb 2023 16:31:56 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: fixeria Gerrit-MessageType: comment
[S] Change in libosmo-gprs[master]: rlcmac: Fill radio_priority in Dl Ack/Nack Channel Request Description
pespin has uploaded this change for review. (
https://gerrit.osmocom.org/c/libosmo-gprs/+/31575 )
Change subject: rlcmac: Fill radio_priority in Dl Ack/Nack Channel Request
Description
..
rlcmac: Fill radio_priority in Dl Ack/Nack Channel Request Description
Change-Id: I740fac72cb418d4b6140b13208fcd4bb922f
---
M include/osmocom/gprs/rlcmac/llc_queue.h
M src/rlcmac/llc_queue.c
M src/rlcmac/rlcmac_enc.c
3 files changed, 37 insertions(+), 12 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/libosmo-gprs refs/changes/75/31575/1
diff --git a/include/osmocom/gprs/rlcmac/llc_queue.h
b/include/osmocom/gprs/rlcmac/llc_queue.h
index a0a91e4..80016e0 100644
--- a/include/osmocom/gprs/rlcmac/llc_queue.h
+++ b/include/osmocom/gprs/rlcmac/llc_queue.h
@@ -29,6 +29,7 @@
};
struct gprs_llc_prio_queue {
+ uint8_t radio_prio; /* Radio prio of this queue, range (1..4) */
struct gprs_codel codel_state;
struct llist_head queue; /* queued LLC DL data. See enum
gprs_rlcmac_llc_queue_prio. */
};
@@ -51,6 +52,7 @@
int gprs_rlcmac_llc_queue_enqueue(struct gprs_rlcmac_llc_queue *q, uint8_t
*ll_pdu, unsigned int ll_pdu_len,
enum osmo_gprs_rlcmac_llc_sapi sapi, uint8_t
radio_prio);
struct msgb *gprs_rlcmac_llc_queue_dequeue(struct gprs_rlcmac_llc_queue *q);
+uint8_t gprs_rlcmac_llc_queue_highest_radio_prio_pending(struct
gprs_rlcmac_llc_queue *q);
static inline size_t gprs_rlcmac_llc_queue_size(const struct
gprs_rlcmac_llc_queue *q)
{
diff --git a/src/rlcmac/llc_queue.c b/src/rlcmac/llc_queue.c
index 2c1aeea..47cb1e9 100644
--- a/src/rlcmac/llc_queue.c
+++ b/src/rlcmac/llc_queue.c
@@ -46,6 +46,7 @@
q->avg_queue_delay = 0;
for (i = 0; i < ARRAY_SIZE(q->pq); i++) {
for (j = 0; j < ARRAY_SIZE(q->pq[i]); j++) {
+ q->pq[i][j].radio_prio = i + 1; /* range (1..4) */
INIT_LLIST_HEAD(>pq[i][j].queue);
gprs_codel_init(>pq[i][j].codel_state);
}
@@ -141,25 +142,31 @@
#define ALPHA 0.5f
+static struct gprs_llc_prio_queue *gprs_rlcmac_llc_queue_find_msg(struct
gprs_rlcmac_llc_queue *q)
+{
+ unsigned int i, j;
+
+ for (i = 0; i < ARRAY_SIZE(q->pq); i++) {
+ for (j = 0; j < ARRAY_SIZE(q->pq[i]); j++) {
+ if (!llist_empty(>pq[i][j].queue))
+ return >pq[i][j];
+ }
+ }
+ return NULL;
+}
+
static struct msgb *gprs_rlcmac_llc_queue_pick_msg(struct
gprs_rlcmac_llc_queue *q, struct gprs_llc_prio_queue **prioq)
{
struct msgb *msg;
struct timespec tv_now, tv_result;
uint32_t lifetime;
- unsigned int i, j;
const struct llc_queue_entry_hdr *ehdr;
- for (i = 0; i < ARRAY_SIZE(q->pq); i++) {
- for (j = 0; j < ARRAY_SIZE(q->pq[i]); j++) {
- if ((msg = msgb_dequeue(>pq[i][j].queue))) {
- *prioq = >pq[i][j];
- goto found;
- }
- }
- }
- return NULL;
+ *prioq = gprs_rlcmac_llc_queue_find_msg(q);
+ if (!(*prioq))
+ return NULL;
-found:
+ msg = msgb_dequeue(&(*prioq)->queue);
ehdr = msgb_l1(msg);
q->queue_size -= 1;
@@ -213,3 +220,10 @@
msgb_pull_to_l2(msg);
return msg;
}
+
+uint8_t gprs_rlcmac_llc_queue_highest_radio_prio_pending(struct
gprs_rlcmac_llc_queue *q)
+{
+ struct gprs_llc_prio_queue *prioq = gprs_rlcmac_llc_queue_find_msg(q);
+ OSMO_ASSERT(prioq);
+ return prioq->radio_prio;
+}
diff --git a/src/rlcmac/rlcmac_enc.c b/src/rlcmac/rlcmac_enc.c
index 4b8c469..6bceb8d 100644
--- a/src/rlcmac/rlcmac_enc.c
+++ b/src/rlcmac/rlcmac_enc.c
@@ -400,7 +400,7 @@
Channel_Request_Description_t *chan_req =
>Channel_Request_Description;
ack->Exist_Channel_Request_Description = 1;
chan_req->PEAK_THROUGHPUT_CLASS = 0; /* TODO */
- chan_req->RADIO_PRIORITY = 0; /* TODO */
+ chan_req->RADIO_PRIORITY =
gprs_rlcmac_llc_queue_highest_radio_prio_pending(dl_tbf->tbf.gre->llc_queue);
chan_req->RLC_MODE = GPRS_RLCMAC_RLC_MODE_ACKNOWLEDGED;
chan_req->LLC_PDU_TYPE = GPRS_RLCMAC_LLC_PDU_TYPE_ACKNOWLEDGED;
chan_req->RLC_OCTET_COUNT = 0; /* TODO */
--
To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/31575
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmo-gprs
Gerrit-Branch: master
Gerrit-Change-Id: I740fac72cb418d4b6140b13208fcd4bb922f
Gerrit-Change-Number: 31575
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-MessageType: newchange
[M] Change in osmocom-bb[master]: modem: route L1CTL prims to/from libosmo-gprs-rlcmac
Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/31572 ) Change subject: modem: route L1CTL prims to/from libosmo-gprs-rlcmac .. Patch Set 1: (1 comment) File src/host/layer23/src/modem/rlcmac.c: https://gerrit.osmocom.org/c/osmocom-bb/+/31572/comment/68b97d29_f24f8d3f PS1, Line 173: rlcmac_prim_l1ctl_alloc > ... which alone takes almost the entire line on my screen Ok, this is not entirely true. It's more like 1/3 of the line (I use big font). But still, passing multiple arguments to it looks like a mess. -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/31572 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I38e9a686f8edc3fe55f961d75e68602c33bbbaaf Gerrit-Change-Number: 31572 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Attention: pespin Gerrit-Comment-Date: Mon, 27 Feb 2023 16:11:30 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Gerrit-MessageType: comment
[M] Change in osmocom-bb[master]: modem: route L1CTL prims to/from libosmo-gprs-rlcmac
Attention is currently required from: pespin, fixeria.
fixeria has posted comments on this change. (
https://gerrit.osmocom.org/c/osmocom-bb/+/31572 )
Change subject: modem: route L1CTL prims to/from libosmo-gprs-rlcmac
..
Patch Set 1:
(1 comment)
File src/host/layer23/src/modem/rlcmac.c:
https://gerrit.osmocom.org/c/osmocom-bb/+/31572/comment/b9cae462_25034a49
PS1, Line 173: rlcmac_prim_l1ctl_alloc
@pespin: I would like to be able to allocate RLCMAC_L1CTL primitives like this,
instead of using functions like
osmo_gprs_rlcmac_prim_alloc_l1ctl_pdch_data_ind(). One problem is that it's
quite a long symbol name, which alone takes almost the entire line on my
screen, so passing it several arguments would make it completely unreadable.
The benefits of letting the user fill-in the prim structure are:
* readability, as I already said above;
* extensibility: once we add more fields, there would be no need to add
`osmo_gprs_rlcmac_prim_alloc_l1ctl_pdch_data_ind{1,2,3,...}()`;
* consistency with other osmo-API, like the L1SAP code.
Would it be possible to expose `[osmo_gprs_]rlcmac_prim_l1ctl_alloc()`?
--
To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/31572
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmocom-bb
Gerrit-Branch: master
Gerrit-Change-Id: I38e9a686f8edc3fe55f961d75e68602c33bbbaaf
Gerrit-Change-Number: 31572
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pespin
Gerrit-Attention: pespin
Gerrit-Attention: fixeria
Gerrit-Comment-Date: Mon, 27 Feb 2023 16:08:47 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment
[M] Change in osmo-pcu[master]: pcu_l1_if_phy: add new PHY API function to disconnect PDCH
dexter has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-pcu/+/31573 )
Change subject: pcu_l1_if_phy: add new PHY API function to disconnect PDCH
..
pcu_l1_if_phy: add new PHY API function to disconnect PDCH
There is a function l1if_connect_pdch, but no complementary function
like we have it with l1if_open_pdch and l1if_close_pdch. The reason for
this is that the PHY implementations that rely on a femtocell DSP do not
need to disconnect the pdch explcitly. However, the planned support for
the E1 based Ercisson RBS CCU will require an explicit disconnect. So
lets add a function call for this.
Change-Id: Ied88f3289bda87c48f5f9255c4591470633cc805
Related: OS#5198
---
M src/osmo-bts-litecell15/lc15_l1_if.c
M src/osmo-bts-oc2g/oc2g_l1_if.c
M src/osmo-bts-sysmo/sysmo_l1_if.c
M src/pcu_l1_if.cpp
M src/pcu_l1_if_phy.h
M tests/alloc/AllocTest.cpp
M tests/alloc/MslotTest.cpp
M tests/app_info/AppInfoTest.cpp
M tests/edge/EdgeTest.cpp
M tests/emu/pcu_emu.cpp
M tests/fn/FnTest.cpp
M tests/llc/LlcTest.cpp
M tests/ms/MsTest.cpp
M tests/tbf/TbfTest.cpp
M tests/types/TypesTest.cpp
M tests/ulc/PdchUlcTest.cpp
16 files changed, 50 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/73/31573/1
diff --git a/src/osmo-bts-litecell15/lc15_l1_if.c
b/src/osmo-bts-litecell15/lc15_l1_if.c
index 053844f..580cdf0 100644
--- a/src/osmo-bts-litecell15/lc15_l1_if.c
+++ b/src/osmo-bts-litecell15/lc15_l1_if.c
@@ -145,6 +145,11 @@
return l1if_req_pdch(fl1h, msg);
}
+int l1if_disconnect_pdch(void *obj, uint8_t ts)
+{
+ return 0;
+}
+
static int handle_ph_readytosend_ind(struct lc15l1_hdl *fl1h,
GsmL1_PhReadyToSendInd_t *rts_ind)
{
diff --git a/src/osmo-bts-oc2g/oc2g_l1_if.c b/src/osmo-bts-oc2g/oc2g_l1_if.c
index 1ea0b26..48005a2 100644
--- a/src/osmo-bts-oc2g/oc2g_l1_if.c
+++ b/src/osmo-bts-oc2g/oc2g_l1_if.c
@@ -146,6 +146,11 @@
return l1if_req_pdch(fl1h, msg);
}
+int l1if_disconnect_pdch(void *obj, uint8_t ts)
+{
+ return 0;
+}
+
static int handle_ph_readytosend_ind(struct oc2gl1_hdl *fl1h,
GsmL1_PhReadyToSendInd_t *rts_ind)
{
diff --git a/src/osmo-bts-sysmo/sysmo_l1_if.c b/src/osmo-bts-sysmo/sysmo_l1_if.c
index 31028f5..18378b6 100644
--- a/src/osmo-bts-sysmo/sysmo_l1_if.c
+++ b/src/osmo-bts-sysmo/sysmo_l1_if.c
@@ -128,6 +128,11 @@
return l1if_req_pdch(fl1h, msg);
}
+int l1if_disconnect_pdch(void *obj, uint8_t ts)
+{
+ return 0;
+}
+
static int handle_ph_readytosend_ind(struct femtol1_hdl *fl1h,
GsmL1_PhReadyToSendInd_t *rts_ind)
{
diff --git a/src/pcu_l1_if.cpp b/src/pcu_l1_if.cpp
index fdee83d..258a118 100644
--- a/src/pcu_l1_if.cpp
+++ b/src/pcu_l1_if.cpp
@@ -918,6 +918,10 @@
trx_nr, ts_nr, pdch->tsc, pdch->fh.enabled
? "yes" : "no");
} else {
if (pdch->is_enabled()) {
+#ifdef ENABLE_DIRECT_PHY
+ if ((info_ind->flags &
PCU_IF_FLAG_SYSMO))
+
l1if_disconnect_pdch(bts->trx[trx_nr].fl1h, ts_nr);
+#endif
pcu_tx_act_req(bts, pdch, 0);
pdch->disable();
}
diff --git a/src/pcu_l1_if_phy.h b/src/pcu_l1_if_phy.h
index 73d0b6f..318d0aa 100644
--- a/src/pcu_l1_if_phy.h
+++ b/src/pcu_l1_if_phy.h
@@ -7,4 +7,5 @@
int l1if_connect_pdch(void *obj, uint8_t ts);
int l1if_pdch_req(void *obj, uint8_t ts, int is_ptcch, uint32_t fn, uint16_t
arfcn, uint8_t block_nr, uint8_t *data,
uint8_t len);
+int l1if_disconnect_pdch(void *obj, uint8_t ts);
int l1if_close_pdch(void *obj);
diff --git a/tests/alloc/AllocTest.cpp b/tests/alloc/AllocTest.cpp
index 21fa6f2..08f5910 100644
--- a/tests/alloc/AllocTest.cpp
+++ b/tests/alloc/AllocTest.cpp
@@ -861,6 +861,7 @@
extern "C" {
void l1if_pdch_req() { abort(); }
void l1if_connect_pdch() { abort(); }
+void l1if_disconnect_pdch() { abort(); }
void l1if_close_pdch() { abort(); }
void l1if_open_pdch() { abort(); }
}
diff --git a/tests/alloc/MslotTest.cpp b/tests/alloc/MslotTest.cpp
index 1b06b0b..1d5ff97 100644
--- a/tests/alloc/MslotTest.cpp
+++ b/tests/alloc/MslotTest.cpp
@@ -175,6 +175,7 @@
extern "C" {
void l1if_pdch_req() { abort(); }
void l1if_connect_pdch() { abort(); }
+void l1if_disconnect_pdch() { abort(); }
void l1if_close_pdch() { abort(); }
void l1if_open_pdch() { abort(); }
}
diff --git a/tests/app_info/AppInfoTest.cpp b/tests/app_info/AppInfoTest.cpp
index 668b081..659c011 100644
--- a/tests/app_info/AppInfoTest.cpp
+++ b/tests/app_info/AppInfoTest.cpp
@@ -198,6 +198,7 @@
extern "C" {
void l1if_pdch_req() { abort(); }
void l1if_connect_pdch() { abort(); }
+void l1if_disconnect_pdch() {
[S] Change in osmo-pcu[master]: pcu_l1_if_phy: add new PHY API function to initialize PHY
dexter has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-pcu/+/31574 )
Change subject: pcu_l1_if_phy: add new PHY API function to initialize PHY
..
pcu_l1_if_phy: add new PHY API function to initialize PHY
The PHY implementations we currently have do not require any
initialization that has to run directly on startup. This will change
when we introduce support for the E1 based Ericsson RBS CCU. Then we
will have to perform at least one elarly initialization (VTY config
file). So lets add an API function for PHY initialization now.
Related: OS#5198
Change-Id: Ibf2a3a058c826f6ee5b740eee72d5be94d460517
---
M src/osmo-bts-litecell15/lc15_l1_if.c
M src/osmo-bts-oc2g/oc2g_l1_if.c
M src/osmo-bts-sysmo/sysmo_l1_if.c
M src/pcu_l1_if_phy.h
M src/pcu_main.cpp
5 files changed, 39 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/74/31574/1
diff --git a/src/osmo-bts-litecell15/lc15_l1_if.c
b/src/osmo-bts-litecell15/lc15_l1_if.c
index 580cdf0..043a3ba 100644
--- a/src/osmo-bts-litecell15/lc15_l1_if.c
+++ b/src/osmo-bts-litecell15/lc15_l1_if.c
@@ -404,3 +404,8 @@
talloc_free(fl1h);
return 0;
}
+
+int l1if_init(void)
+{
+ return 0;
+}
diff --git a/src/osmo-bts-oc2g/oc2g_l1_if.c b/src/osmo-bts-oc2g/oc2g_l1_if.c
index 48005a2..c827d72 100644
--- a/src/osmo-bts-oc2g/oc2g_l1_if.c
+++ b/src/osmo-bts-oc2g/oc2g_l1_if.c
@@ -409,3 +409,8 @@
talloc_free(fl1h);
return 0;
}
+
+int l1if_init(void)
+{
+ return 0;
+}
diff --git a/src/osmo-bts-sysmo/sysmo_l1_if.c b/src/osmo-bts-sysmo/sysmo_l1_if.c
index 18378b6..348497f 100644
--- a/src/osmo-bts-sysmo/sysmo_l1_if.c
+++ b/src/osmo-bts-sysmo/sysmo_l1_if.c
@@ -386,3 +386,8 @@
talloc_free(fl1h);
return 0;
}
+
+int l1if_init(void)
+{
+ return 0;
+}
diff --git a/src/pcu_l1_if_phy.h b/src/pcu_l1_if_phy.h
index 318d0aa..297883b 100644
--- a/src/pcu_l1_if_phy.h
+++ b/src/pcu_l1_if_phy.h
@@ -3,6 +3,7 @@
#include
#include
+int l1if_init(void);
void *l1if_open_pdch(uint8_t trx_no, uint32_t hlayer1, struct gsmtap_inst
*gsmtap);
int l1if_connect_pdch(void *obj, uint8_t ts);
int l1if_pdch_req(void *obj, uint8_t ts, int is_ptcch, uint32_t fn, uint16_t
arfcn, uint8_t block_nr, uint8_t *data,
diff --git a/src/pcu_main.cpp b/src/pcu_main.cpp
index 901ee6c..ec7bddd 100644
--- a/src/pcu_main.cpp
+++ b/src/pcu_main.cpp
@@ -33,6 +33,7 @@
extern "C" {
#include "pcu_vty.h"
#include "coding_scheme.h"
+#include "pcu_l1_if_phy.h"
#include
#include
#include
@@ -250,6 +251,12 @@
osmo_cpu_sched_vty_init(tall_pcu_ctx);
logging_vty_add_deprecated_subsys(tall_pcu_ctx, "bssgp");
+#ifdef ENABLE_DIRECT_PHY
+ rc = l1if_init();
+ if (rc < 0)
+ return -EINVAL;
+#endif
+
handle_options(argc, argv);
if ((!!spoof_mcc) + (!!spoof_mnc) == 1) {
fprintf(stderr, "--mcc and --mnc must be specified "
--
To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/31574
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-pcu
Gerrit-Branch: master
Gerrit-Change-Id: Ibf2a3a058c826f6ee5b740eee72d5be94d460517
Gerrit-Change-Number: 31574
Gerrit-PatchSet: 1
Gerrit-Owner: dexter
Gerrit-MessageType: newchange
[M] Change in osmocom-bb[master]: layer23: implement Rx/Tx API for GPRS related messages
fixeria has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmocom-bb/+/31571 )
Change subject: layer23: implement Rx/Tx API for GPRS related messages
..
layer23: implement Rx/Tx API for GPRS related messages
Change-Id: I87950e893ef96ff8328f43f1548111aa9f66439b
Related: OS#5500
---
M src/host/layer23/include/osmocom/bb/common/l1ctl.h
M src/host/layer23/include/osmocom/bb/common/ms.h
M src/host/layer23/src/common/l1ctl.c
3 files changed, 128 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/71/31571/1
diff --git a/src/host/layer23/include/osmocom/bb/common/l1ctl.h
b/src/host/layer23/include/osmocom/bb/common/l1ctl.h
index 5b20506..a151a98 100644
--- a/src/host/layer23/include/osmocom/bb/common/l1ctl.h
+++ b/src/host/layer23/include/osmocom/bb/common/l1ctl.h
@@ -75,4 +75,16 @@
/* Transmit L1CTL_NEIGH_PM_REQ */
int l1ctl_tx_neigh_pm_req(struct osmocom_ms *ms, int num, uint16_t *arfcn);
+/* Transmit L1CTL_GPRS_UL_BLOCK_REQ */
+int l1ctl_tx_gprs_ul_block_req(struct osmocom_ms *ms, uint32_t fn, uint8_t tn,
+ const uint8_t *data, size_t data_len);
+
+/* Transmit L1CTL_GPRS_UL_TBF_CFG_REQ */
+int l1ctl_tx_gprs_ul_tbf_cfg_req(struct osmocom_ms *ms, uint8_t tbf_nr,
+uint8_t slotmask);
+
+/* Transmit L1CTL_GPRS_DL_TBF_CFG_REQ */
+int l1ctl_tx_gprs_dl_tbf_cfg_req(struct osmocom_ms *ms, uint8_t tbf_nr,
+uint8_t slotmask, uint8_t dl_tfi);
+
#endif
diff --git a/src/host/layer23/include/osmocom/bb/common/ms.h
b/src/host/layer23/include/osmocom/bb/common/ms.h
index 30bb514..e4888a7 100644
--- a/src/host/layer23/include/osmocom/bb/common/ms.h
+++ b/src/host/layer23/include/osmocom/bb/common/ms.h
@@ -36,6 +36,7 @@
struct osmol1_entity {
int (*l1_traffic_ind)(struct osmocom_ms *ms, struct msgb *msg);
+ int (*l1_gprs_dl_block_ind)(struct osmocom_ms *ms, struct msgb *msg);
};
struct osmomncc_entity {
diff --git a/src/host/layer23/src/common/l1ctl.c
b/src/host/layer23/src/common/l1ctl.c
index 34051fd..0d85625 100644
--- a/src/host/layer23/src/common/l1ctl.c
+++ b/src/host/layer23/src/common/l1ctl.c
@@ -978,6 +978,108 @@
return 0;
}
+/* Receive L1CTL_GPRS_DL_BLOCK_IND */
+static int rx_l1_gprs_dl_block_ind(struct osmocom_ms *ms, struct msgb *msg)
+{
+ struct l1ctl_gprs_dl_block_ind *ind = (void *)msg->l1h;
+
+ if (msgb_l1len(msg) < sizeof(*ind)) {
+ LOGP(DL1C, LOGL_ERROR,
+"Rx malformed L1CTL_GPRS_DL_BLOCK_IND (len=%u < %zu)\n",
+msgb_l1len(msg), sizeof(*ind));
+ return -EINVAL;
+ }
+ if (OSMO_UNLIKELY(ind->hdr.tn >= 8)) {
+ LOGP(DL1C, LOGL_ERROR,
+"Rx malformed L1CTL_GPRS_DL_BLOCK_IND (TDMA Tn=%u)\n",
+ind->hdr.tn);
+ return -EINVAL;
+ }
+
+ msg->l2h = (void *)>data[0];
+
+ DEBUGP(DL1C, "Rx GPRS DL block (flags=0x%02x, fn=%u, tn=%u, len=%u):
%s\n",
+ ind->hdr.flags, osmo_load32be(>hdr.fn), ind->hdr.tn,
+ msgb_l2len(msg), msgb_hexdump_l2(msg));
+
+ /* distribute or drop */
+ if (ms->l1_entity.l1_gprs_dl_block_ind)
+ return ms->l1_entity.l1_gprs_dl_block_ind(ms, msg);
+
+ msgb_free(msg);
+ return 0;
+}
+
+/* Transmit L1CTL_GPRS_UL_BLOCK_REQ */
+int l1ctl_tx_gprs_ul_block_req(struct osmocom_ms *ms, uint32_t fn, uint8_t tn,
+ const uint8_t *data, size_t data_len)
+{
+ struct l1ctl_gprs_ul_block_req *req;
+ struct msgb *msg;
+
+ msg = osmo_l1_alloc(L1CTL_GPRS_UL_BLOCK_REQ);
+ if (!msg)
+ return -ENOMEM;
+
+ req = (void *)msgb_put(msg, sizeof(*req));
+ req->hdr.fn = fn;
+ req->hdr.tn = tn;
+ if (data_len > 0)
+ memcpy(msgb_put(msg, data_len), data, data_len);
+
+ DEBUGP(DL1C, "Tx GPRS UL block (flags=0x%02x, fn=%u, tn=%u, len=%zu):
%s\n",
+ req->hdr.flags, fn, tn, data_len, osmo_hexdump(data, data_len));
+
+ return osmo_send_l1(ms, msg);
+}
+
+/* Transmit L1CTL_GPRS_UL_TBF_CFG_REQ */
+int l1ctl_tx_gprs_ul_tbf_cfg_req(struct osmocom_ms *ms, uint8_t tbf_nr,
+uint8_t slotmask)
+{
+ struct l1ctl_gprs_ul_tbf_cfg_req *req;
+ struct msgb *msg;
+
+ msg = osmo_l1_alloc(L1CTL_GPRS_UL_TBF_CFG_REQ);
+ if (!msg)
+ return -ENOMEM;
+
+ req = (void *)msgb_put(msg, sizeof(*req));
+ *req = (struct l1ctl_gprs_ul_tbf_cfg_req) {
+ .tbf_nr = tbf_nr,
+ .slotmask = slotmask,
+ };
+
+ DEBUGP(DL1C, "Tx GPRS UL TBF CFG (tbf_nr=%u, slotmask=0x%02x)\n",
+ tbf_nr, slotmask);
+
+ return osmo_send_l1(ms, msg);
+}
+
+/* Transmit L1CTL_GPRS_DL_TBF_CFG_REQ */
+int l1ctl_tx_gprs_dl_tbf_cfg_req(struct
[M] Change in osmocom-bb[master]: modem: route L1CTL prims to/from libosmo-gprs-rlcmac
fixeria has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmocom-bb/+/31572 )
Change subject: modem: route L1CTL prims to/from libosmo-gprs-rlcmac
..
modem: route L1CTL prims to/from libosmo-gprs-rlcmac
Change-Id: I38e9a686f8edc3fe55f961d75e68602c33bbbaaf
Related: OS#5500
---
M src/host/layer23/src/modem/rlcmac.c
1 file changed, 78 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/72/31572/1
diff --git a/src/host/layer23/src/modem/rlcmac.c
b/src/host/layer23/src/modem/rlcmac.c
index 83dcd6c..3a391ed 100644
--- a/src/host/layer23/src/modem/rlcmac.c
+++ b/src/host/layer23/src/modem/rlcmac.c
@@ -36,10 +36,13 @@
#include
#include
+#include
#include
#include
#include
+#include
+
static int modem_rlcmac_handle_grr(struct osmo_gprs_rlcmac_prim *rlcmac_prim)
{
int rc;
@@ -110,12 +113,50 @@
return rc;
}
+static int modem_rlcmac_handle_l1ctl(struct osmocom_ms *ms,
+const struct osmo_gprs_rlcmac_prim
*rlcmac_prim)
+{
+ const struct osmo_gprs_rlcmac_l1ctl_prim *prim = _prim->l1ctl;
+
+ switch (rlcmac_prim->oph.primitive) {
+ case OSMO_GPRS_RLCMAC_L1CTL_RACH:
+ if (prim->rach_req.is_11bit) {
+ LOGP(DRLCMAC, LOGL_NOTICE,
+"%s(): 11-bit RACH is not supported\n", __func__);
+ return -ENOTSUP;
+ }
+ return l1ctl_tx_rach_req(ms, 0, 0, prim->rach_req.ra, 0, 0);
+ case OSMO_GPRS_RLCMAC_L1CTL_PDCH_DATA:
+ return l1ctl_tx_gprs_ul_block_req(ms, prim->pdch_data_req.fn,
+ prim->pdch_data_req.ts_nr,
+ prim->pdch_data_req.data,
+
prim->pdch_data_req.data_len);
+ case OSMO_GPRS_RLCMAC_L1CTL_CFG_UL_TBF:
+ return l1ctl_tx_gprs_ul_tbf_cfg_req(ms,
prim->cfg_ul_tbf_req.ul_tbf_nr,
+
prim->cfg_ul_tbf_req.ul_slotmask);
+ case OSMO_GPRS_RLCMAC_L1CTL_CFG_DL_TBF:
+ return l1ctl_tx_gprs_dl_tbf_cfg_req(ms,
prim->cfg_dl_tbf_req.dl_tbf_nr,
+
prim->cfg_dl_tbf_req.dl_slotmask,
+
prim->cfg_dl_tbf_req.dl_tfi);
+ default:
+ LOGP(DRLCMAC, LOGL_DEBUG,
+"%s(): Unexpected L1CTL prim 0x%02x\n",
+__func__, rlcmac_prim->oph.primitive);
+ return -ENOTSUP;
+ }
+}
+
static int modem_rlcmac_prim_down_cb(struct osmo_gprs_rlcmac_prim
*rlcmac_prim, void *user_data)
{
const char *pdu_name = osmo_gprs_rlcmac_prim_name(rlcmac_prim);
+ struct osmocom_ms *ms = user_data;
int rc = 0;
switch (rlcmac_prim->oph.sap) {
+ case OSMO_GPRS_RLCMAC_SAP_L1CTL:
+ LOGP(DRLCMAC, LOGL_DEBUG, "%s(): Rx %s\n", __func__, pdu_name);
+ rc = modem_rlcmac_handle_l1ctl(ms, rlcmac_prim);
+ break;
default:
LOGP(DRLCMAC, LOGL_DEBUG, "%s(): Unexpected Rx %s\n", __func__,
pdu_name);
OSMO_ASSERT(0);
@@ -123,6 +164,30 @@
return rc;
}
+static int l1ctl_dl_block_cb(struct osmocom_ms *ms, struct msgb *msg)
+{
+ const struct l1ctl_gprs_dl_block_ind *ind = (void *)msg->l1h;
+ struct osmo_gprs_rlcmac_prim *prim;
+
+ /* FIXME: rlcmac_prim_l1ctl_alloc() is not exposed */
+ prim = rlcmac_prim_l1ctl_alloc(OSMO_GPRS_RLCMAC_L1CTL_PDCH_DATA,
+ PRIM_OP_INDICATION, msgb_l2len(msg));
+ prim->l1ctl = (struct osmo_gprs_rlcmac_l1ctl_prim) {
+ .pdch_data_ind = {
+ /* TODO: ind->usf */
+ .fn = osmo_load32be(>hdr.fn),
+ .ts_nr = ind->hdr.tn,
+ .rx_lev = ind->meas.rx_lev,
+ .ber10k = osmo_load16be(>meas.ber10k),
+ .ci_cb = osmo_load16be(>meas.ci_cb),
+ .data_len = msgb_l2len(msg),
+ .data = msgb_l2(msg),
+ }
+ };
+
+ return osmo_gprs_rlcmac_prim_lower_up(prim);
+}
+
int modem_rlcmac_init(struct osmocom_ms *ms)
{
int rc;
@@ -134,5 +199,8 @@
osmo_gprs_rlcmac_prim_set_up_cb(modem_rlcmac_prim_up_cb, ms);
osmo_gprs_rlcmac_prim_set_down_cb(modem_rlcmac_prim_down_cb, ms);
+
+ ms->l1_entity.l1_gprs_dl_block_ind = _dl_block_cb;
+
return rc;
}
--
To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/31572
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmocom-bb
Gerrit-Branch: master
Gerrit-Change-Id:
[S] Change in osmo-ggsn[master]: Bump version: 1.10.0.4-bf69 → 1.10.1
fixeria has submitted this change. (
https://gerrit.osmocom.org/c/osmo-ggsn/+/31570 )
Change subject: Bump version: 1.10.0.4-bf69 → 1.10.1
..
Bump version: 1.10.0.4-bf69 → 1.10.1
Change-Id: Ibde9f259bccce29638d35efbd597669f5584e295
---
M debian/changelog
1 file changed, 21 insertions(+), 0 deletions(-)
Approvals:
pespin: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/debian/changelog b/debian/changelog
index be0948e..281ec0b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+osmo-ggsn (1.10.1) unstable; urgency=medium
+
+ [ Oliver Smith ]
+ * debian/libgtp6.shlibs: new file
+
+ [ Vadim Yanitskiy ]
+ * lib/icmpv6.h: fix struct icmpv6_{radv_hdr,opt_prefix}
+ * gtp/gsn.c: fix 'No newline at end of file'
+ * gtp: use OSMO_ASSERT() in gtp_new()
+
+ -- Vadim Yanitskiy Mon, 27 Feb 2023 22:35:47 +0700
+
osmo-ggsn (1.10.0) unstable; urgency=medium
[ Max ]
--
To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/31570
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ggsn
Gerrit-Branch: master
Gerrit-Change-Id: Ibde9f259bccce29638d35efbd597669f5584e295
Gerrit-Change-Number: 31570
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
[S] Change in osmo-ggsn[master]: Bump version: 1.10.0.4-bf69 → 1.10.1
Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/31570 ) Change subject: Bump version: 1.10.0.4-bf69 → 1.10.1 .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/31570 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: Ibde9f259bccce29638d35efbd597669f5584e295 Gerrit-Change-Number: 31570 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: pespin Gerrit-CC: Jenkins Builder Gerrit-Attention: fixeria Gerrit-Comment-Date: Mon, 27 Feb 2023 15:43:05 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-ggsn[master]: Bump version: 1.10.0.4-bf69 → 1.10.1
fixeria has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ggsn/+/31570 )
Change subject: Bump version: 1.10.0.4-bf69 → 1.10.1
..
Bump version: 1.10.0.4-bf69 → 1.10.1
Change-Id: Ibde9f259bccce29638d35efbd597669f5584e295
---
M debian/changelog
1 file changed, 21 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ggsn refs/changes/70/31570/1
diff --git a/debian/changelog b/debian/changelog
index be0948e..281ec0b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+osmo-ggsn (1.10.1) unstable; urgency=medium
+
+ [ Oliver Smith ]
+ * debian/libgtp6.shlibs: new file
+
+ [ Vadim Yanitskiy ]
+ * lib/icmpv6.h: fix struct icmpv6_{radv_hdr,opt_prefix}
+ * gtp/gsn.c: fix 'No newline at end of file'
+ * gtp: use OSMO_ASSERT() in gtp_new()
+
+ -- Vadim Yanitskiy Mon, 27 Feb 2023 22:35:47 +0700
+
osmo-ggsn (1.10.0) unstable; urgency=medium
[ Max ]
--
To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/31570
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ggsn
Gerrit-Branch: master
Gerrit-Change-Id: Ibde9f259bccce29638d35efbd597669f5584e295
Gerrit-Change-Number: 31570
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria
Gerrit-MessageType: newchange
[M] Change in osmo-ttcn3-hacks[master]: library/RSL_Types: RSL_SpeechAlgo: support CSD
Attention is currently required from: osmith. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/31556 to look at the new patch set (#2). Change subject: library/RSL_Types: RSL_SpeechAlgo: support CSD .. library/RSL_Types: RSL_SpeechAlgo: support CSD Add data rates from 3GPP TS 48.058 § 9.3.6 octet 6 to the enum, and rename it from RSL_SpeechAlgo to RSL_SpeechAlgoDataRate so it's clear that it contains both. Rename RSL_CMOD_SP_GSM3 to RSL_CMOD_SP_GSM3_DT_NT1 and RSL_CMOD_SP_GSM4 to RSL_CMOD_SP_GSM4_DT_NT8 because their values are shared between a speech and a data entry. Related: OS#4393 Change-Id: Ief2d95c7e9d71afb26fa74da755294226c8e158d --- M bsc/BSC_Tests.ttcn M bts/BTS_Tests.ttcn M bts/BTS_Tests_VAMOS.ttcn M bts/BTS_Tests_perf.ttcn M library/RSL_Types.ttcn 5 files changed, 71 insertions(+), 37 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/56/31556/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/31556 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ief2d95c7e9d71afb26fa74da755294226c8e158d Gerrit-Change-Number: 31556 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: osmith Gerrit-MessageType: newpatchset
[S] Change in libosmo-gprs[master]: tbf_dl: Fix state_fsm instance not freed
Attention is currently required from: pespin. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-gprs/+/31537 to look at the new patch set (#2). Change subject: tbf_dl: Fix state_fsm instance not freed .. tbf_dl: Fix state_fsm instance not freed Change-Id: I2f89810dd346cee904dcff0b598e229bd5f84a9f --- M src/rlcmac/tbf_dl.c M tests/rlcmac/rlcmac_prim_test.err 2 files changed, 11 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-gprs refs/changes/37/31537/2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/31537 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I2f89810dd346cee904dcff0b598e229bd5f84a9f Gerrit-Change-Number: 31537 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: pespin Gerrit-MessageType: newpatchset
[S] Change in osmo-ggsn[rel-1.9.1]: lib/icmpv6.h: fix struct icmpv6_{radv_hdr,opt_prefix}
fixeria has submitted this change. (
https://gerrit.osmocom.org/c/osmo-ggsn/+/31560 )
Change subject: lib/icmpv6.h: fix struct icmpv6_{radv_hdr,opt_prefix}
..
lib/icmpv6.h: fix struct icmpv6_{radv_hdr,opt_prefix}
Fix wrong field order in the big-endian variants.
Change-Id: Ifaa63bb5496e056805bd13b964c8b430fb11c24c
(cherry picked from commit 99afe979efec7bf3bd0dbd2da2c00df71e5f474d)
---
M lib/icmpv6.h
1 file changed, 18 insertions(+), 8 deletions(-)
Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, approved
diff --git a/lib/icmpv6.h b/lib/icmpv6.h
index 4b4dc37..ee5ef29 100644
--- a/lib/icmpv6.h
+++ b/lib/icmpv6.h
@@ -44,10 +44,9 @@
uint8_t res:6,
m:1,
o:1;
-#else
- uint8_t m:1,
- o:1,
- res:6;
+#elif OSMO_IS_BIG_ENDIAN
+/* auto-generated from the little endian part above
(libosmocore/contrib/struct_endianness.py) */
+ uint8_t o:1, m:1, res:6;
#endif
uint16_t router_lifetime;
uint32_t reachable_time;
@@ -72,10 +71,9 @@
uint8_t res:6,
a:1,
l:1;
-#else
- uint8_t l:1,
- a:1,
- res:6;
+#elif OSMO_IS_BIG_ENDIAN
+/* auto-generated from the little endian part above
(libosmocore/contrib/struct_endianness.py) */
+ uint8_t l:1, a:1, res:6;
#endif
uint32_t valid_lifetime;
uint32_t preferred_lifetime;
--
To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/31560
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ggsn
Gerrit-Branch: rel-1.9.1
Gerrit-Change-Id: Ifaa63bb5496e056805bd13b964c8b430fb11c24c
Gerrit-Change-Number: 31560
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
[S] Change in osmo-ggsn[rel-1.9.1]: Bump version: 1.9.0.1-921b → 1.9.1
fixeria has submitted this change. (
https://gerrit.osmocom.org/c/osmo-ggsn/+/31561 )
Change subject: Bump version: 1.9.0.1-921b → 1.9.1
..
Bump version: 1.9.0.1-921b → 1.9.1
Change-Id: Ibbf1b867c1784ad0d1834a87cab6e1e09eb71f63
---
M debian/changelog
1 file changed, 15 insertions(+), 0 deletions(-)
Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, approved
diff --git a/debian/changelog b/debian/changelog
index 08cfb0b..8b10af0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+osmo-ggsn (1.9.1) unstable; urgency=medium
+
+ * lib/icmpv6.h: fix struct icmpv6_{radv_hdr,opt_prefix}
+
+ -- Vadim Yanitskiy Mon, 27 Feb 2023 22:14:59 +0700
+
osmo-ggsn (1.9.0) unstable; urgency=medium
[ Pau Espin Pedrol ]
--
To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/31561
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ggsn
Gerrit-Branch: rel-1.9.1
Gerrit-Change-Id: Ibbf1b867c1784ad0d1834a87cab6e1e09eb71f63
Gerrit-Change-Number: 31561
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
[S] Change in osmo-ggsn[rel-1.9.1]: lib/icmpv6.h: fix struct icmpv6_{radv_hdr,opt_prefix}
Attention is currently required from: fixeria.
pespin has posted comments on this change. (
https://gerrit.osmocom.org/c/osmo-ggsn/+/31560 )
Change subject: lib/icmpv6.h: fix struct icmpv6_{radv_hdr,opt_prefix}
..
Patch Set 1: Code-Review+2
--
To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/31560
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ggsn
Gerrit-Branch: rel-1.9.1
Gerrit-Change-Id: Ifaa63bb5496e056805bd13b964c8b430fb11c24c
Gerrit-Change-Number: 31560
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pespin
Gerrit-Attention: fixeria
Gerrit-Comment-Date: Mon, 27 Feb 2023 15:21:18 +
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
[S] Change in osmo-ggsn[rel-1.9.1]: Bump version: 1.9.0.1-921b → 1.9.1
Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/31561 ) Change subject: Bump version: 1.9.0.1-921b → 1.9.1 .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/31561 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: rel-1.9.1 Gerrit-Change-Id: Ibbf1b867c1784ad0d1834a87cab6e1e09eb71f63 Gerrit-Change-Number: 31561 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Attention: fixeria Gerrit-Comment-Date: Mon, 27 Feb 2023 15:20:14 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-ggsn[rel-1.9.1]: Bump version: 1.9.0.1-921b → 1.9.1
fixeria has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ggsn/+/31561 )
Change subject: Bump version: 1.9.0.1-921b → 1.9.1
..
Bump version: 1.9.0.1-921b → 1.9.1
Change-Id: Ibbf1b867c1784ad0d1834a87cab6e1e09eb71f63
---
M debian/changelog
1 file changed, 15 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ggsn refs/changes/61/31561/1
diff --git a/debian/changelog b/debian/changelog
index 08cfb0b..8b10af0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+osmo-ggsn (1.9.1) unstable; urgency=medium
+
+ * lib/icmpv6.h: fix struct icmpv6_{radv_hdr,opt_prefix}
+
+ -- Vadim Yanitskiy Mon, 27 Feb 2023 22:14:59 +0700
+
osmo-ggsn (1.9.0) unstable; urgency=medium
[ Pau Espin Pedrol ]
--
To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/31561
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ggsn
Gerrit-Branch: rel-1.9.1
Gerrit-Change-Id: Ibbf1b867c1784ad0d1834a87cab6e1e09eb71f63
Gerrit-Change-Number: 31561
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria
Gerrit-MessageType: newchange
[S] Change in osmo-ggsn[rel-1.9.1]: lib/icmpv6.h: fix struct icmpv6_{radv_hdr,opt_prefix}
fixeria has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ggsn/+/31560 )
Change subject: lib/icmpv6.h: fix struct icmpv6_{radv_hdr,opt_prefix}
..
lib/icmpv6.h: fix struct icmpv6_{radv_hdr,opt_prefix}
Fix wrong field order in the big-endian variants.
Change-Id: Ifaa63bb5496e056805bd13b964c8b430fb11c24c
(cherry picked from commit 99afe979efec7bf3bd0dbd2da2c00df71e5f474d)
---
M lib/icmpv6.h
1 file changed, 18 insertions(+), 8 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ggsn refs/changes/60/31560/1
diff --git a/lib/icmpv6.h b/lib/icmpv6.h
index 4b4dc37..ee5ef29 100644
--- a/lib/icmpv6.h
+++ b/lib/icmpv6.h
@@ -44,10 +44,9 @@
uint8_t res:6,
m:1,
o:1;
-#else
- uint8_t m:1,
- o:1,
- res:6;
+#elif OSMO_IS_BIG_ENDIAN
+/* auto-generated from the little endian part above
(libosmocore/contrib/struct_endianness.py) */
+ uint8_t o:1, m:1, res:6;
#endif
uint16_t router_lifetime;
uint32_t reachable_time;
@@ -72,10 +71,9 @@
uint8_t res:6,
a:1,
l:1;
-#else
- uint8_t l:1,
- a:1,
- res:6;
+#elif OSMO_IS_BIG_ENDIAN
+/* auto-generated from the little endian part above
(libosmocore/contrib/struct_endianness.py) */
+ uint8_t l:1, a:1, res:6;
#endif
uint32_t valid_lifetime;
uint32_t preferred_lifetime;
--
To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/31560
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ggsn
Gerrit-Branch: rel-1.9.1
Gerrit-Change-Id: Ifaa63bb5496e056805bd13b964c8b430fb11c24c
Gerrit-Change-Number: 31560
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria
Gerrit-MessageType: newchange
[S] Change in osmo-ggsn[rel-1.10.1]: lib/icmpv6.h: fix struct icmpv6_{radv_hdr,opt_prefix}
fixeria has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ggsn/+/31559 )
Change subject: lib/icmpv6.h: fix struct icmpv6_{radv_hdr,opt_prefix}
..
lib/icmpv6.h: fix struct icmpv6_{radv_hdr,opt_prefix}
Fix wrong field order in the big-endian variants.
Change-Id: Ifaa63bb5496e056805bd13b964c8b430fb11c24c
(cherry picked from commit 99afe979efec7bf3bd0dbd2da2c00df71e5f474d)
---
M lib/icmpv6.h
1 file changed, 18 insertions(+), 8 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ggsn refs/changes/59/31559/1
diff --git a/lib/icmpv6.h b/lib/icmpv6.h
index 4b4dc37..ee5ef29 100644
--- a/lib/icmpv6.h
+++ b/lib/icmpv6.h
@@ -44,10 +44,9 @@
uint8_t res:6,
m:1,
o:1;
-#else
- uint8_t m:1,
- o:1,
- res:6;
+#elif OSMO_IS_BIG_ENDIAN
+/* auto-generated from the little endian part above
(libosmocore/contrib/struct_endianness.py) */
+ uint8_t o:1, m:1, res:6;
#endif
uint16_t router_lifetime;
uint32_t reachable_time;
@@ -72,10 +71,9 @@
uint8_t res:6,
a:1,
l:1;
-#else
- uint8_t l:1,
- a:1,
- res:6;
+#elif OSMO_IS_BIG_ENDIAN
+/* auto-generated from the little endian part above
(libosmocore/contrib/struct_endianness.py) */
+ uint8_t l:1, a:1, res:6;
#endif
uint32_t valid_lifetime;
uint32_t preferred_lifetime;
--
To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/31559
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ggsn
Gerrit-Branch: rel-1.10.1
Gerrit-Change-Id: Ifaa63bb5496e056805bd13b964c8b430fb11c24c
Gerrit-Change-Number: 31559
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria
Gerrit-MessageType: newchange
[S] Change in osmocom-bb[master]: modem: Use libosmo-gprs-rlcmac L1CTL primitives
pespin has submitted this change. (
https://gerrit.osmocom.org/c/osmocom-bb/+/31359 )
Change subject: modem: Use libosmo-gprs-rlcmac L1CTL primitives
..
modem: Use libosmo-gprs-rlcmac L1CTL primitives
Related: OS#5500
Change-Id: I9d3066f19077796b2ccf70b15cc57b6488f015be
---
M src/host/layer23/src/modem/app_modem.c
1 file changed, 20 insertions(+), 11 deletions(-)
Approvals:
fixeria: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/src/host/layer23/src/modem/app_modem.c
b/src/host/layer23/src/modem/app_modem.c
index 28984e7..b55768f 100644
--- a/src/host/layer23/src/modem/app_modem.c
+++ b/src/host/layer23/src/modem/app_modem.c
@@ -39,6 +39,7 @@
#include
#include
#include
+#include
#include
#include
@@ -230,6 +231,7 @@
static int handle_si13(struct osmocom_ms *ms, struct msgb *msg)
{
int rc;
+ struct osmo_gprs_rlcmac_prim *rlcmac_prim;
if (msgb_l3len(msg) != GSM_MACBLOCK_LEN)
return -EINVAL;
@@ -240,7 +242,10 @@
if (rc != 0)
return rc;
- return 0;
+ /* Forward SI13 to RLC/MAC layer */
+ rlcmac_prim = osmo_gprs_rlcmac_prim_alloc_l1ctl_ccch_data_ind(0 /*
TODO: fn */, msgb_l3(msg));
+ rc = osmo_gprs_rlcmac_prim_lower_up(rlcmac_prim);
+ return rc;
}
static int modem_rx_bcch(struct osmocom_ms *ms, struct msgb *msg)
@@ -275,6 +280,7 @@
struct gsm48_rrlayer *rr = >rrlayer;
uint8_t ch_type, ch_subch, ch_ts;
int rc;
+ struct osmo_gprs_rlcmac_prim *rlcmac_prim;
/* Discard CS channel assignment */
if ((ia->page_mode >> 4) == 0)
@@ -340,17 +346,10 @@
ia->chan_desc.h1.tsc, GSM48_CMODE_SIGN,
0);
}
- const uint8_t *data = msgb_l3(msg) + sizeof(*ia) + ia->mob_alloc_len;
- size_t data_len = msgb_l3len(msg) - (sizeof(*ia) + ia->mob_alloc_len);
- IA_RestOctets_t iaro;
-
- rc = osmo_gprs_rlcmac_decode_imm_ass_ro(, data, data_len);
- if (rc != 0) {
- LOGP(DRR, LOGL_ERROR, "Failed to decode IA Rest Octets IE\n");
+ rlcmac_prim = osmo_gprs_rlcmac_prim_alloc_l1ctl_ccch_data_ind(0 /*
TODO: fn */, (uint8_t *)ia);
+ rc = osmo_gprs_rlcmac_prim_lower_up(rlcmac_prim);
+ if (rc < 0)
return rc;
- }
-
- /* TODO: deliver decoded params to the RLC/MAC layer */
rr->state = GSM48_RR_ST_DEDICATED;
return 0;
--
To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/31359
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmocom-bb
Gerrit-Branch: master
Gerrit-Change-Id: I9d3066f19077796b2ccf70b15cc57b6488f015be
Gerrit-Change-Number: 31359
Gerrit-PatchSet: 3
Gerrit-Owner: pespin
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
[S] Change in osmo-pcu[master]: pcu_l1_if_phy: add header file for struct gsmtap_inst
Attention is currently required from: pespin, dexter. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/31558 ) Change subject: pcu_l1_if_phy: add header file for struct gsmtap_inst .. Patch Set 2: (1 comment) File src/pcu_l1_if_phy.h: https://gerrit.osmocom.org/c/osmo-pcu/+/31558/comment/4ff0ef29_5c0884d1 PS2, Line 4: #include It would be enough to add a forward declaration. -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/31558 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I9b859c4f7906f31547549d4ff7751fb720519270 Gerrit-Change-Number: 31558 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Attention: pespin Gerrit-Attention: dexter Gerrit-Comment-Date: Mon, 27 Feb 2023 14:47:52 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
[S] Change in osmo-pcu[master]: pcu_l1_if: use only the term "direct PHY access"
dexter has submitted this change. (
https://gerrit.osmocom.org/c/osmo-pcu/+/31361 )
Change subject: pcu_l1_if: use only the term "direct PHY access"
..
pcu_l1_if: use only the term "direct PHY access"
The log messages and code comments sometimes refer to the direct PHY
access feature as "direct DSP access". Lets use only the term "direct
PHY access"
Change-Id: I121ad85cd8581c40f390dbaad0d6a028d68b095e
---
M src/pcu_l1_if.cpp
1 file changed, 16 insertions(+), 3 deletions(-)
Approvals:
Jenkins Builder: Verified
dexter: Looks good to me, approved
diff --git a/src/pcu_l1_if.cpp b/src/pcu_l1_if.cpp
index 62f02d9..fdee83d 100644
--- a/src/pcu_l1_if.cpp
+++ b/src/pcu_l1_if.cpp
@@ -610,7 +610,7 @@
return rc;
}
-/* C -> C++ adapter for direct DSP access code (e.g. osmo-bts-sysmo) */
+/* C -> C++ adapter for direct PHY access code (e.g. osmo-bts-sysmo) */
extern "C" int pcu_rx_rach_ind_ptcch(struct gprs_rlcmac_bts *bts, uint8_t
trx_nr, uint8_t ts_nr, uint32_t fn, int16_t qta)
{
struct rach_ind_params rip = {
@@ -869,11 +869,11 @@
the_pcu->gsmtap);
if (!bts->trx[trx_nr].fl1h) {
LOGP(DL1IF, LOGL_FATAL, "Failed to open direct "
- "DSP access for PDCH.\n");
+ "PHY access for PDCH.\n");
exit(0);
}
#else
- LOGP(DL1IF, LOGL_FATAL, "Compiled without direct DSP "
+ LOGP(DL1IF, LOGL_FATAL, "Compiled without direct PHY "
"access for PDCH, but enabled at "
"BTS. Please deactivate it!\n");
exit(0);
--
To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/31361
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-pcu
Gerrit-Branch: master
Gerrit-Change-Id: I121ad85cd8581c40f390dbaad0d6a028d68b095e
Gerrit-Change-Number: 31361
Gerrit-PatchSet: 5
Gerrit-Owner: dexter
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: dexter
Gerrit-Reviewer: msuraev
Gerrit-Reviewer: neels
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
[S] Change in osmo-pcu[master]: pcu_l1_if: use only the term "direct PHY access"
dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/31361 ) Change subject: pcu_l1_if: use only the term "direct PHY access" .. Patch Set 5: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/31361 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I121ad85cd8581c40f390dbaad0d6a028d68b095e Gerrit-Change-Number: 31361 Gerrit-PatchSet: 5 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: msuraev Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 27 Feb 2023 14:31:17 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-pcu[master]: pcu_l1_if: use only the term "direct PHY access"
Attention is currently required from: dexter. Hello Jenkins Builder, neels, pespin, msuraev, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-pcu/+/31361 to look at the new patch set (#5). Change subject: pcu_l1_if: use only the term "direct PHY access" .. pcu_l1_if: use only the term "direct PHY access" The log messages and code comments sometimes refer to the direct PHY access feature as "direct DSP access". Lets use only the term "direct PHY access" Change-Id: I121ad85cd8581c40f390dbaad0d6a028d68b095e --- M src/pcu_l1_if.cpp 1 file changed, 16 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/61/31361/5 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/31361 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I121ad85cd8581c40f390dbaad0d6a028d68b095e Gerrit-Change-Number: 31361 Gerrit-PatchSet: 5 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: msuraev Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Attention: dexter Gerrit-MessageType: newpatchset
[S] Change in osmo-pcu[master]: pcu_l1_if_phy: add header file for struct gsmtap_inst
dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/31558 ) Change subject: pcu_l1_if_phy: add header file for struct gsmtap_inst .. pcu_l1_if_phy: add header file for struct gsmtap_inst Lets include the header file that contains the definition of struct gsmtap_inst since this struct is directly used with l1if_open_pdch. Change-Id: I9b859c4f7906f31547549d4ff7751fb720519270 Related: OS#5198 --- M src/pcu_l1_if_phy.h 1 file changed, 14 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/58/31558/1 diff --git a/src/pcu_l1_if_phy.h b/src/pcu_l1_if_phy.h index f25bf7b..73d0b6f 100644 --- a/src/pcu_l1_if_phy.h +++ b/src/pcu_l1_if_phy.h @@ -1,6 +1,7 @@ #pragma once #include +#include void *l1if_open_pdch(uint8_t trx_no, uint32_t hlayer1, struct gsmtap_inst *gsmtap); int l1if_connect_pdch(void *obj, uint8_t ts); -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/31558 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I9b859c4f7906f31547549d4ff7751fb720519270 Gerrit-Change-Number: 31558 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-MessageType: newchange
[S] Change in libosmocore[master]: gsm0808_enc/dec_channel_type: fix transparent flag
osmith has submitted this change. (
https://gerrit.osmocom.org/c/libosmocore/+/31536 )
Change subject: gsm0808_enc/dec_channel_type: fix transparent flag
..
gsm0808_enc/dec_channel_type: fix transparent flag
According to 3GPP TS 48.008 3.2.2.11, it is inverted.
0: Transparent service
1: Non-transparent service
Change-Id: I2e5786ad053ee871079b4a8d95caccd6b03b59b6
---
M src/gsm/gsm0808_utils.c
M tests/gsm0808/gsm0808_test.c
2 files changed, 21 insertions(+), 7 deletions(-)
Approvals:
fixeria: Looks good to me, approved
pespin: Looks good to me, but someone else must approve
Jenkins Builder: Verified
diff --git a/src/gsm/gsm0808_utils.c b/src/gsm/gsm0808_utils.c
index d8c275a..efa9305 100644
--- a/src/gsm/gsm0808_utils.c
+++ b/src/gsm/gsm0808_utils.c
@@ -510,7 +510,7 @@
case GSM0808_CHAN_DATA:
byte = ct->data_rate;
- if (ct->data_transparent)
+ if (!ct->data_transparent)
byte |= 0x40; /* Set T/NT */
if (ct->data_rate_allowed_is_set) {
@@ -580,7 +580,7 @@
case GSM0808_CHAN_DATA:
byte = *elem;
elem++;
- ct->data_transparent = byte & 0x40; /* T/NT */
+ ct->data_transparent = !(byte & 0x40); /* T/NT */
ct->data_rate = byte & 0x3f;
/* Optional extension for non-transparent service */
diff --git a/tests/gsm0808/gsm0808_test.c b/tests/gsm0808/gsm0808_test.c
index 9a6de1e..d7c278f 100644
--- a/tests/gsm0808/gsm0808_test.c
+++ b/tests/gsm0808/gsm0808_test.c
@@ -1098,7 +1098,7 @@
struct gsm0808_channel_type dec_ct = {};
struct msgb *msg;
uint8_t ct_enc_expected[] = { GSM0808_IE_CHANNEL_TYPE,
- 0x03, 0x02, 0x0b, 0x51,
+ 0x03, 0x02, 0x0b, 0x11,
};
uint8_t rc_enc;
int rc_dec;
@@ -1142,7 +1142,7 @@
struct gsm0808_channel_type dec_ct = {};
struct msgb *msg;
uint8_t ct_enc_expected[] = { GSM0808_IE_CHANNEL_TYPE,
- 0x05, 0x02, 0x0b, 0x91, 0x8b, 0x20,
+ 0x05, 0x02, 0x0b, 0xd1, 0x8b, 0x20,
};
uint8_t rc_enc;
int rc_dec;
@@ -1237,17 +1237,17 @@
OSMO_ASSERT(rc == -ENOTSUP);
/* Data: ext in Octet 5 with transparent service */
- const uint8_t hex2[] = { 0x02, 0x0b, 0xc0, 0x00 };
+ const uint8_t hex2[] = { 0x02, 0x0b, 0x80, 0x00 };
rc = gsm0808_dec_channel_type(, hex2, sizeof(hex2));
OSMO_ASSERT(rc == -EINVAL);
/* Data: ext in Octet 5, but too short */
- const uint8_t hex3[] = { 0x02, 0x0b, 0x80 };
+ const uint8_t hex3[] = { 0x02, 0x0b, 0xc0 };
rc = gsm0808_dec_channel_type(, hex3, sizeof(hex3));
OSMO_ASSERT(rc == -EOVERFLOW);
/* Data: ext in Octet 5a, but too short */
- const uint8_t hex4[] = { 0x02, 0x0b, 0x80, 0x80 };
+ const uint8_t hex4[] = { 0x02, 0x0b, 0xc0, 0x80 };
rc = gsm0808_dec_channel_type(, hex4, sizeof(hex4));
OSMO_ASSERT(rc == -EOVERFLOW);
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/31536
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I2e5786ad053ee871079b4a8d95caccd6b03b59b6
Gerrit-Change-Number: 31536
Gerrit-PatchSet: 2
Gerrit-Owner: osmith
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: osmith
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
[S] Change in libosmocore[master]: gsm0808_enc/dec_channel_type: fix transparent flag
Attention is currently required from: osmith. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/31536 ) Change subject: gsm0808_enc/dec_channel_type: fix transparent flag .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/31536 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I2e5786ad053ee871079b4a8d95caccd6b03b59b6 Gerrit-Change-Number: 31536 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Attention: osmith Gerrit-Comment-Date: Mon, 27 Feb 2023 13:42:49 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-bsc[master]: Cosmetic: fix various typos
osmith has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-bsc/+/31539 )
Change subject: Cosmetic: fix various typos
..
Cosmetic: fix various typos
Change-Id: I9225e733e3afa8171f24253e21eaffc654f689af
---
M src/osmo-bsc/assignment_fsm.c
M src/osmo-bsc/codec_pref.c
2 files changed, 11 insertions(+), 2 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/39/31539/1
diff --git a/src/osmo-bsc/assignment_fsm.c b/src/osmo-bsc/assignment_fsm.c
index e2213d4..d382f10 100644
--- a/src/osmo-bsc/assignment_fsm.c
+++ b/src/osmo-bsc/assignment_fsm.c
@@ -389,7 +389,7 @@
return 0;
}
-/* Check if the incoming assignment requests requires a voice stream or not,
+/* Check if the incoming assignment request requires a voice stream or not,
* we will look at the preferred and the alternate channel mode and also make
* sure that both are consistent. */
static int check_requires_voice_stream(struct gsm_subscriber_connection *conn)
diff --git a/src/osmo-bsc/codec_pref.c b/src/osmo-bsc/codec_pref.c
index 9b4b37f..3824e14 100644
--- a/src/osmo-bsc/codec_pref.c
+++ b/src/osmo-bsc/codec_pref.c
@@ -376,7 +376,7 @@
break;
}
- /* Exit without result, in case no match can be deteched */
+ /* Exit without result, in case no match can be detected */
if (!match) {
ch_mode_rate->chan_mode = GSM48_CMODE_SIGN;
ch_mode_rate->chan_rate = CH_RATE_SDCCH;
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/31539
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: I9225e733e3afa8171f24253e21eaffc654f689af
Gerrit-Change-Number: 31539
Gerrit-PatchSet: 1
Gerrit-Owner: osmith
Gerrit-MessageType: newchange
